diff -Nru clamav-0.94.dfsg.1~rc1/aclocal.m4 clamav-0.94.dfsg.1/aclocal.m4 --- clamav-0.94.dfsg.1~rc1/aclocal.m4 2008-10-11 15:58:47.000000000 -0400 +++ clamav-0.94.dfsg.1/aclocal.m4 2008-10-24 05:08:37.000000000 -0400 @@ -130,6658 +130,6 @@ AC_LIB_PROG_LD_GNU ]) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -_LT_REQUIRED_DARWIN_CHECKS - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# -------------------------- -# Check for some things on darwin -AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[0123]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" - else - _lt_dsymutil= - fi - ;; - esac -]) - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $rm conftest* -]) - -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - 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; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $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 - cd .. - rmdir conftest - $rm conftest* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -m4_if($1,[],[ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -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' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - 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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - 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" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - 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_cmds='`test .$module = .yes && echo .so || echo .dylib`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[[3-9]]*) - 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' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # 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, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-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='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - 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=yes - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - 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 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - 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=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - 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 - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - 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 - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognize a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname 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%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# find the pathname 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 - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX - -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -fi -])# _LT_AC_PROG_CXXCPP - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_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_LANG_GCJ - - -# AC_LIBTOOL_RC -# ------------- -# 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]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -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_DLOPEN_SELF - -# Report which library types will actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # 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' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _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)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - 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_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -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${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -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${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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(ld_shlibs, $1)=no - ;; - esac - fi - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _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' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -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_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP - -# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" - -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -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_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG - - -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -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_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG - - -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG - - -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # 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 LTCFLAGS 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 \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -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. - 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 - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -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'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - 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'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - 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'" - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - _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' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _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)='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - 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' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - 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' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _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)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _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)='-Bstatic' - ;; - - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _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' - ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - 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 - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _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' - ;; - - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $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' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - 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' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _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)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - 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_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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(ld_shlibs, $1)=no - ;; - esac - fi - ;; - - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _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 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$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' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - - -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. - -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE - -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P - -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -]) - # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru clamav-0.94.dfsg.1~rc1/ChangeLog clamav-0.94.dfsg.1/ChangeLog --- clamav-0.94.dfsg.1~rc1/ChangeLog 2008-10-15 06:48:02.000000000 -0400 +++ clamav-0.94.dfsg.1/ChangeLog 2008-10-30 12:18:40.000000000 -0400 @@ -1,3 +1,149 @@ +Thu Oct 30 17:18:28 CET 2008 (tk) +--------------------------------- + * V 0.94.1 + +Thu Oct 30 16:47:17 CET 2008 (tk) +--------------------------------- + * libclamav/readdb.c: daily.ign was overwriting local.ign (bb#1265) + +Thu Oct 30 13:52:42 CET 2008 (acab) +----------------------------------- + * libclamav/vba_extract.c: get_unicode_name off-by-one - bb#1239 + reported by Moritz Jodeit + +Thu Oct 30 13:07:53 EET 2008 (edwin) +------------------------------------ + * unit_tests/valgrind.supp: suppress more valgrind race warnings + +Thu Oct 30 11:18:24 EET 2008 (edwin) +------------------------------------ + * Makefile.am, Makefile.in: fix flags + +Thu Oct 30 11:04:19 EET 2008 (edwin) +------------------------------------ + * configure, configure.in: fix test + +Wed Oct 29 22:53:21 EET 2008 (edwin) +------------------------------------ + * configure, configure.in: be nice to non-GNU compilers, and use + memcmp/abort instead of __builtin_* + +Wed Oct 29 21:48:03 EET 2008 (edwin) +------------------------------------ + * configure, configure.in, m4/acinclude.m4: Try to make a difference + between failing to link the bzip2 testcase and the testcase failing + (bb #1240) + +Wed Oct 29 21:40:20 EET 2008 (edwin) +------------------------------------ + * configure, configure.in: fix message: it is enough to use a lower + optimization level + +Wed Oct 29 21:34:01 EET 2008 (edwin) +------------------------------------ + * unit_tests/test-freshclam.conf: we need a config file for + freshclam just to test -V, use a minimal one. + +Wed Oct 29 21:22:15 EET 2008 (edwin) +------------------------------------ + * Makefile.am, Makefile.in, configure, configure.in: fix make + distcheck on gcc < 4.3 (bb #1259) + +Wed Oct 29 20:52:07 EET 2008 (edwin) +------------------------------------ + * configure, configure.in: add testcase for gcc bug 37573, affecting + gcc 4.1.2 at -O3 too (bb #1258) + +Tue Oct 28 22:08:19 EET 2008 (edwin) +------------------------------------ + * unit_tests/valgrind.supp: fix more valgrind warnings + +Tue Oct 28 21:47:34 EET 2008 (edwin) +------------------------------------ + * unit_tests/valgrind.supp: suppress another valgrind warning on + Fedora + +Tue Oct 28 20:37:35 CET 2008 (tk) +--------------------------------- + * freshclam: add new config option DetectionStatsCountry + +Tue Oct 28 10:52:41 CET 2008 (tk) +--------------------------------- + * freshclam: re-enable --submit-stats (bb#1235) + +Mon Oct 27 18:07:08 EET 2008 (edwin) +------------------------------------ + * unit_tests/valgrind.supp: suppress valgrind warnings for old libc. + The warning is in __strcpy_chk, but I don't want to suppress a + useful warnings in recent libcs, and there is no way to specify both + a function and object in a suppression, so I suppressed all warnings + from libc-2.5 when called from mbox/message.c + +Mon Oct 27 16:20:02 EET 2008 (edwin) +------------------------------------ + * unit_tests/duma_tests.sh: fix typo in test script + +Mon Oct 27 16:15:36 EET 2008 (edwin) +------------------------------------ + * unit_tests/valgrind.supp: fix valgrind warnings on Fedora + +Mon Oct 27 14:54:34 CET 2008 (tk) +--------------------------------- + * freshclam/execute.c: don't execute special events twice in interactive + mode (bb#1256) + +Fri Oct 24 11:45:41 CEST 2008 (tk) +---------------------------------- + * libclamav: fix detection of Worm.Mydoom.M.log and control it with + CL_SCAN_ALGORITHMIC and dconf (bb#1241) + +Thu Oct 23 23:01:10 EEST 2008 (edwin) +------------------------------------- + * clamd/scanner.c: fix leak on rare error path (bb #1254) + +Wed Oct 22 20:52:37 EEST 2008 (edwin) +------------------------------------- + * unit_tests/check_clamav.c, unit_tests/check_disasm.c, + unit_tests/check_jsnorm.c, unit_tests/check_matchers.c, + unit_tests/check_regex.c, unit_tests/check_uniq.c, + unit_tests/checks.h: support building with older versions of check + +Wed Oct 22 17:45:11 EEST 2008 (edwin) +------------------------------------- + * configure, m4/acinclude.m4: fix typo in previous commit + +Wed Oct 22 17:43:38 EEST 2008 (edwin) +------------------------------------- + * configure, m4/acinclude.m4: When user has overriden --libdir, we + still need to find out the correct acl_libdirstem + +Mon Oct 20 17:23:12 EEST 2008 (edwin) +------------------------------------- + * aclocal.m4, configure, configure.in, m4/acinclude.m4, + m4/lib-prefix.m4: use -print-multi-os-directory to set default + libdir (bb #1240) + * WARNING: On a 64-bit multiarch OS, this will by + default install libclamav into /usr/local/lib64, if your system uses + /usr/local/lib for 32bit apps. If the system uses /usr/local/lib + for 64-bit apps and lib32 for 32bit apps, there is no change (unless + you use -m32). + +Sun Oct 19 15:58:23 EEST 2008 (edwin) +------------------------------------- + * unit_tests/check_clamd.sh: the 2nd clamd process might already be + gone, wait returns 127. This fixed a silent make check failure on + NetBSD. + +Sun Oct 19 14:57:26 EEST 2008 (edwin) +------------------------------------- + * unit_tests/duma_tests.sh, unit_tests/efence_tests.sh: locate + efence/duma using libtool's search path so that it works with + /usr/lib64 (bb #1250) + +Thu Oct 16 11:02:38 CEST 2008 (tk) +---------------------------------- + * freshclam/manager.c: fix compilation error on systems without IPv6 (bb#1237) + Wed Oct 15 12:47:53 CEST 2008 (tk) ---------------------------------- * 0.94.1rc1 diff -Nru clamav-0.94.dfsg.1~rc1/clamd/scanner.c clamav-0.94.dfsg.1/clamd/scanner.c --- clamav-0.94.dfsg.1~rc1/clamd/scanner.c 2008-08-25 17:45:16.000000000 -0400 +++ clamav-0.94.dfsg.1/clamd/scanner.c 2008-10-24 05:08:36.000000000 -0400 @@ -250,9 +250,12 @@ free(fname); } } + } else { + free(fname); } } } else { + logg("^lstat failed on %s: %s\n", fname, strerror(errno)); free(fname); } } diff -Nru clamav-0.94.dfsg.1~rc1/configure clamav-0.94.dfsg.1/configure --- clamav-0.94.dfsg.1~rc1/configure 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/configure 2008-11-12 15:24:52.000000000 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for clamav devel. +# Generated by GNU Autoconf 2.61 for clamav 0.94.1. # # Report bugs to . # @@ -723,8 +723,8 @@ # Identity of this package. PACKAGE_NAME='clamav' PACKAGE_TARNAME='clamav' -PACKAGE_VERSION='devel' -PACKAGE_STRING='clamav devel' +PACKAGE_VERSION='0.94.1' +PACKAGE_STRING='clamav 0.94.1' PACKAGE_BUGREPORT='http://bugs.clamav.net/' ac_unique_file="clamscan/clamscan.c" @@ -872,6 +872,8 @@ OTOOL OTOOL64 CPP +DISTCHECK_ENABLE_FLAGS_TRUE +DISTCHECK_ENABLE_FLAGS_FALSE VERSIONSCRIPTFLAG VERSIONSCRIPT_TRUE VERSIONSCRIPT_FALSE @@ -1428,7 +1430,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures clamav devel to adapt to many kinds of systems. +\`configure' configures clamav 0.94.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1501,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clamav devel:";; + short | recursive ) echo "Configuration of clamav 0.94.1:";; esac cat <<\_ACEOF @@ -1641,7 +1643,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clamav configure devel +clamav configure 0.94.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1655,7 +1657,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clamav $as_me devel, which was +It was created by clamav $as_me 0.94.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2665,7 +2667,7 @@ # Define the identity of the package. PACKAGE='clamav' - VERSION='devel' + VERSION='0.94.1' # Some tools Automake needs. @@ -2809,7 +2811,7 @@ _ACEOF -VERSION="0.94.1rc1" +VERSION="0.94.1" cat >>confdefs.h <<_ACEOF #define VERSION "$VERSION" @@ -2817,7 +2819,7 @@ LC_CURRENT=5 -LC_REVISION=2 +LC_REVISION=3 LC_AGE=0 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" @@ -2986,7 +2988,6 @@ fi - case `pwd` in *\ * | *\ *) { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -4754,13 +4755,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4757: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4758: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4760: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4761: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4763: output\"" >&5) + (eval echo "\"\$as_me:4764: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5971,7 +5972,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5974 "configure"' > conftest.$ac_ext + echo '#line 5975 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7822,11 +7823,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7825: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7826: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7829: \$? = $ac_status" >&5 + echo "$as_me:7830: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8161,11 +8162,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8164: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8165: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8168: \$? = $ac_status" >&5 + echo "$as_me:8169: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8266,11 +8267,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8269: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8270: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8273: \$? = $ac_status" >&5 + echo "$as_me:8274: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8321,11 +8322,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8324: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8325: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8328: \$? = $ac_status" >&5 + echo "$as_me:8329: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11077,7 +11078,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11080 "configure" +#line 11081 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11173,7 +11174,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11176 "configure" +#line 11177 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11412,6 +11413,42 @@ _ACEOF + + # Only modify libdir if user has not overriden it + default_libdir='${exec_prefix}/lib' + if test "$libdir" = "$default_libdir"; then + { echo "$as_me:$LINENO: checking for multiarch libdir" >&5 +echo $ECHO_N "checking for multiarch libdir... $ECHO_C" >&6; } + # Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html + if test "$GCC" = yes; then + ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` + else + ac_multilibdir=. + fi + case "$ac_multilibdir" in + # I don't know if the first two cases can happen, but it would be a + # bad idea to override $exec_prefix + /* | ../../* | .) acl_libdirstem=lib ;; + ../*) acl_libdirstem=`echo $ac_multilibdir | sed 's/^...//' ` ;; + *) acl_libdirstem=lib/$ac_multilibdir ;; + esac + libdir='${exec_prefix}/'$acl_libdirstem + { echo "$as_me:$LINENO: result: $libdir" >&5 +echo "${ECHO_T}$libdir" >&6; } + else + acl_libdirstem=lib + if test -d "$libdir"; then + case "$libdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$libdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac + esac + fi + fi + + { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then @@ -12203,6 +12240,27 @@ VERSION_SUFFIX="$VERSION_SUFFIX-broken-compiler" fi +# add distcheck warning flags +distcheck_enable_flags=0 +if test "x$ac_compiler_gnu" = "xyes"; then + gcc_version=`${CC} -dumpversion` + case "${gcc_version}" in + 4.[3456789].*) + distcheck_enable_flags=1 + ;; + [56789].*) + distcheck_enable_flags=1 + ;; + esac +fi + if test "x$distcheck_enable_flags" = "x1"; then + DISTCHECK_ENABLE_FLAGS_TRUE= + DISTCHECK_ENABLE_FLAGS_FALSE='#' +else + DISTCHECK_ENABLE_FLAGS_TRUE='#' + DISTCHECK_ENABLE_FLAGS_FALSE= +fi + { echo "$as_me:$LINENO: checking for gcc bug PR27603" >&5 @@ -12521,6 +12579,132 @@ +{ echo "$as_me:$LINENO: checking for gcc bug PR37573" >&5 +echo $ECHO_N "checking for gcc bug PR37573... $ECHO_C" >&6; } +if test "$cross_compiling" = yes; then + { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5 +echo "${ECHO_T}cross-compiling, assumed ok" >&6; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +struct S +{ + unsigned int *a; + unsigned int b; + unsigned int c[624]; +}; +static unsigned char +foo (struct S *s) +{ + unsigned int r; + if (!--s->b) + { + unsigned int *c = s->c; + unsigned int i; + s->a = c; + for (i = 0; i < 227; i++) + c[i] = + ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^ + ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i + 397]; + for (; i < 623; i++) + c[i] = + ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^ + ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i - 227]; + c[623] = + ((((c[623] ^ c[0]) & 0x7ffffffe) ^ c[623]) >> 1) ^ ((0 - (c[0] & 1)) & + 0x9908b0df) ^ c[i + - + 227]; + } + r = *(s->a++); + r ^= (r >> 11); + r ^= ((r & 0xff3a58ad) << 7); + r ^= ((r & 0xffffdf8c) << 15); + r ^= (r >> 18); + return (unsigned char) (r >> 1); +} + +void +bar (unsigned char *p, unsigned int q, unsigned int r) +{ + struct S s; + unsigned int i; + unsigned int *c = s.c; + *c = r; + for (i = 1; i < 624; i++) + c[i] = i + 0x6c078965 * ((c[i - 1] >> 30) ^ c[i - 1]); + s.b = 1; + while (q--) + *p++ ^= foo (&s); +}; + +static unsigned char p[23] = { + 0xc0, 0x49, 0x17, 0x32, 0x62, 0x1e, 0x2e, 0xd5, 0x4c, 0x19, 0x28, 0x49, + 0x91, 0xe4, 0x72, 0x83, 0x91, 0x3d, 0x93, 0x83, 0xb3, 0x61, 0x38 +}; + +static unsigned char q[23] = { + 0x3e, 0x41, 0x55, 0x54, 0x4f, 0x49, 0x54, 0x20, 0x55, 0x4e, 0x49, 0x43, + 0x4f, 0x44, 0x45, 0x20, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x3c +}; + +int +main (void) +{ + unsigned int s; + s = 23; + bar (p, s, s + 0xa25e); + if (memcmp (p, q, s) != 0) + abort (); + return 0; +} + + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { echo "$as_me:$LINENO: result: ok, bug not present" >&5 +echo "${ECHO_T}ok, bug not present" >&6; } +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" >&5 +echo "$as_me: error: your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" >&2;} + { (exit 1); exit 1; }; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + { echo "$as_me:$LINENO: checking for ld --version-script" >&5 echo $ECHO_N "checking for ld --version-script... $ECHO_C" >&6; } if test "${ac_cv_ld_version_script+set}" = set; then @@ -13935,23 +14119,7 @@ - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi + @@ -15840,7 +16008,7 @@ save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib"; + LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem"; { echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5 echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6; } if test "${ac_cv_lib_bz2_bzReadOpen+set}" = set; then @@ -16145,7 +16313,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -ac_cv_c_cve_2008_1372=bugged + +if test $? -gt 127; then + ac_cv_c_cve_2008_1372=bugged +else + ac_cv_c_cve_2008_1372=linkfailed +fi + fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -16170,9 +16344,19 @@ { echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5 echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;} fi + if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then + { echo "$as_me:$LINENO: WARNING: ****** Unable to link bzip2 testcase" >&5 +echo "$as_me: WARNING: ****** Unable to link bzip2 testcase" >&2;} + { echo "$as_me:$LINENO: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&5 +echo "$as_me: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&2;} + { echo "$as_me:$LINENO: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&5 +echo "$as_me: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&2;} + { echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5 +echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;} + fi case "$ac_cv_c_cve_2008_1372" in - ok|bugged) + ok|bugged|linkfailed) LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2" cat >>confdefs.h <<\_ACEOF @@ -18833,6 +19017,7 @@ #define SENDMAIL_VERSION_B $sendmailver_b _ACEOF + fi if test -n "$sendmailver_c"; then @@ -21130,6 +21315,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${DISTCHECK_ENABLE_FLAGS_TRUE}" && test -z "${DISTCHECK_ENABLE_FLAGS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21479,7 +21671,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clamav $as_me devel, which was +This file was extended by clamav $as_me 0.94.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21532,7 +21724,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -clamav config.status devel +clamav config.status 0.94.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22143,6 +22335,8 @@ OTOOL!$OTOOL$ac_delim OTOOL64!$OTOOL64$ac_delim CPP!$CPP$ac_delim +DISTCHECK_ENABLE_FLAGS_TRUE!$DISTCHECK_ENABLE_FLAGS_TRUE$ac_delim +DISTCHECK_ENABLE_FLAGS_FALSE!$DISTCHECK_ENABLE_FLAGS_FALSE$ac_delim VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim @@ -22189,7 +22383,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -Nru clamav-0.94.dfsg.1~rc1/configure.in clamav-0.94.dfsg.1/configure.in --- clamav-0.94.dfsg.1~rc1/configure.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/configure.in 2008-11-12 15:24:52.000000000 -0500 @@ -39,11 +39,11 @@ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package]) dnl change this on a release -VERSION="0.94.1rc1" +VERSION="0.94" AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package]) LC_CURRENT=5 -LC_REVISION=2 +LC_REVISION=3 LC_AGE=0 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" AC_SUBST([LIBCLAMAV_VERSION]) @@ -53,15 +53,13 @@ AC_PROG_LN_S AC_PROG_MAKE_SET -dnl libtool by default brings in check for all the languages/compilers (CXX/F77/...) -dnl we don't need them, so avoid tagged configuration -dnl libtool-1.6 should already do it right, but thats not stable yet -AC_DEFUN([_LT_AC_TAGCONFIG]) AC_PROG_LIBTOOL AC_DEFINE([SCANBUFF], 131072, [scan buffer size]) AC_DEFINE([FILEBUFF], 8192, [file i/o buffer size]) +AC_LIB_MULTILIB_GUESS + AC_HEADER_STDC AC_C_RESTRICT AC_C_CONST @@ -100,6 +98,20 @@ VERSION_SUFFIX="$VERSION_SUFFIX-broken-compiler" fi +# add distcheck warning flags +distcheck_enable_flags=0 +if test "x$ac_compiler_gnu" = "xyes"; then + gcc_version=`${CC} -dumpversion` + case "${gcc_version}" in + 4.[[3456789]].*) + distcheck_enable_flags=1 + ;; + [[56789]].*) + distcheck_enable_flags=1 + ;; + esac +fi +AM_CONDITIONAL([DISTCHECK_ENABLE_FLAGS], test "x$distcheck_enable_flags" = "x1") dnl Checks if compiler produces valid code, regardless of compiler dnl we do these checks here to avoid receiving endless bugreports about @@ -244,6 +256,89 @@ ], [AC_MSG_RESULT([ok, bug not present])], [AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])]) +dnl Check if compiler produces invalid code on gcc PR37573 (affects autoit.c) +dnl this is a bug in gcc 4.4.0, but for some reason it affects gcc 4.1.2 too +dnl gcc 4.1.3 is OK. This bug occurs only at -O3. +AC_MSG_CHECKING([for gcc bug PR37573]) +AC_TRY_RUN( + [ +#include +#include +struct S +{ + unsigned int *a; + unsigned int b; + unsigned int c[624]; +}; +static unsigned char +foo (struct S *s) +{ + unsigned int r; + if (!--s->b) + { + unsigned int *c = s->c; + unsigned int i; + s->a = c; + for (i = 0; i < 227; i++) + c[i] = + ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^ + ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i + 397]; + for (; i < 623; i++) + c[i] = + ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^ + ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i - 227]; + c[623] = + ((((c[623] ^ c[0]) & 0x7ffffffe) ^ c[623]) >> 1) ^ ((0 - (c[0] & 1)) & + 0x9908b0df) ^ c[i + - + 227]; + } + r = *(s->a++); + r ^= (r >> 11); + r ^= ((r & 0xff3a58ad) << 7); + r ^= ((r & 0xffffdf8c) << 15); + r ^= (r >> 18); + return (unsigned char) (r >> 1); +} + +void +bar (unsigned char *p, unsigned int q, unsigned int r) +{ + struct S s; + unsigned int i; + unsigned int *c = s.c; + *c = r; + for (i = 1; i < 624; i++) + c[i] = i + 0x6c078965 * ((c[i - 1] >> 30) ^ c[i - 1]); + s.b = 1; + while (q--) + *p++ ^= foo (&s); +}; + +static unsigned char p[23] = { + 0xc0, 0x49, 0x17, 0x32, 0x62, 0x1e, 0x2e, 0xd5, 0x4c, 0x19, 0x28, 0x49, + 0x91, 0xe4, 0x72, 0x83, 0x91, 0x3d, 0x93, 0x83, 0xb3, 0x61, 0x38 +}; + +static unsigned char q[23] = { + 0x3e, 0x41, 0x55, 0x54, 0x4f, 0x49, 0x54, 0x20, 0x55, 0x4e, 0x49, 0x43, + 0x4f, 0x44, 0x45, 0x20, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x3c +}; + +int +main (void) +{ + unsigned int s; + s = 23; + bar (p, s, s + 0xa25e); + if (memcmp (p, q, s) != 0) + abort (); + return 0; +} + +], [AC_MSG_RESULT([ok, bug not present])], +[AC_MSG_ERROR([your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573])], [AC_MSG_RESULT([cross-compiling, assumed ok])]) + dnl Linker feature checks dnl check for version script support in the linker (GNU ld, or Solaris ld style) AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl @@ -436,7 +531,7 @@ then AC_LIB_LINKFLAGS([bz2]) save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib"; + LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem"; AC_CHECK_LIB([bz2], [bzReadOpen], [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])] ) @@ -450,9 +545,17 @@ AC_MSG_WARN([****** We strongly suggest you to update to bzip2 1.0.5.]) AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!]) fi + if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then + dnl This shouldn't happen + dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet + AC_MSG_WARN([****** Unable to link bzip2 testcase]) + AC_MSG_WARN([****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify]) + AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!]) + AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!]) + fi case "$ac_cv_c_cve_2008_1372" in - ok|bugged) + ok|bugged|linkfailed) LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2" AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2]) ;; Binary files /tmp/50HOQhS7DZ/clamav-0.94.dfsg.1~rc1/database/daily.cvd and /tmp/vTsPRd07xF/clamav-0.94.dfsg.1/database/daily.cvd differ Binary files /tmp/50HOQhS7DZ/clamav-0.94.dfsg.1~rc1/database/main.cvd and /tmp/vTsPRd07xF/clamav-0.94.dfsg.1/database/main.cvd differ diff -Nru clamav-0.94.dfsg.1~rc1/debian/changelog clamav-0.94.dfsg.1/debian/changelog --- clamav-0.94.dfsg.1~rc1/debian/changelog 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/changelog 2008-11-12 15:24:52.000000000 -0500 @@ -1,3 +1,54 @@ +clamav (0.94.dfsg.1-1ubuntu0.1) intrepid-security; urgency=low + + * SECURITY UPDATE: (LP: #296704) + - Fix off-by-one heap overflow + * Other changes: + - debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6 for + clamav-daemon and clamav-freshclam + - add debian/usr.bin.freshclam and debian/usr.sbin.clamd + - debian/clamav-(daemon|freshclam).dirs: add etc/apparmor.d/force-complain + - debian/clamav-(daemon|freshclam).install: install profiles + - debian/clamav-(daemon|freshclam).preinst: create symlink for + force-complain/ on pre-feisty upgrades, upgrades where apparmor-profiles + profile is unchanged (ie non-enforcing) and upgrades where the profile + doesn't exist. + - debian/clamav-(daemon|freshclam).postrm: remove symlink in + force-complain/ on purge. + - debian/clamav-(daemon|freshclam).postinst.in: reload apparmor + - update README.Debian with note on Apparmor + * Update apparmor profile for clamd to work with TCP sockets (LP: #288942) + + -- Scott Kitterman Wed, 12 Nov 2008 15:20:49 -0500 + +clamav (0.94.dfsg.1-1) unstable; urgency=low + + [ Stephen Gran ] + * New upstream version (closes: #505134, #502165, #501298) + * Handle new option SubmitDetectionStats in freshclam.conf + * Remove RAR from the description, since we really don't handle it anymore + * Skip 'sleep until -e socket' logic if socket is of type inet (LP #296086) + + [ Michael Meskes ] + * Added myself as uploader. + * Changed watch file to account for dfsg extension. + * Do not configure temporary directory in clamd.conf anymore unless it is + already configured there. + * Added Basque debconf translation (closes: #500007) + + [ Michael Tautschnig ] + * Use lsb's status_of_proc function to determine the status of the process + and return with according exit codes (closes: #486076) + * Updated Dutch debconf translation (thanks Paul Gevers ) + (closes: #501627) + * Changed versioned dependency of clamav-daemon to clamav-base to equals + (closes: #500416) + * Handle new option DetectionStatsCountry in freshclam.conf + * Don't trust the multilib guessing stuff, always use libdir=$prefix/lib + * Removed nowadays unused lintian overrides + * Create md5sums control file for clamav-dbg as well (thanks, lintian) + + -- Michael Tautschnig Wed, 12 Nov 2008 01:57:58 +0100 + clamav (0.94.dfsg.1~rc1-0ubuntu2) intrepid; urgency=low * update clamd profile for use with exim (LP: #288110) diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-base.dirs clamav-0.94.dfsg.1/debian/clamav-base.dirs --- clamav-0.94.dfsg.1~rc1/debian/clamav-base.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-base.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -1,6 +1,5 @@ etc/ etc/clamav/ -usr/share/lintian/overrides/ usr/share/bug/clamav-base var/ var/lib/ diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-base.overrides clamav-0.94.dfsg.1/debian/clamav-base.overrides --- clamav-0.94.dfsg.1~rc1/debian/clamav-base.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-base.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -clamav-base: partially-translated-question diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-base.postinst.in clamav-0.94.dfsg.1/debian/clamav-base.postinst.in --- clamav-0.94.dfsg.1~rc1/debian/clamav-base.postinst.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-base.postinst.in 2008-11-12 15:24:52.000000000 -0500 @@ -202,7 +202,6 @@ [ -z "$LogFileMaxSize" ] && LogFileMaxSize=0 [ -z "$LogClean" ] && LogClean=false [ -z "$LogVerbose" ] && LogVerbose=false - [ -z "$TemporaryDirectory" ] && TemporaryDirectory='/tmp' [ -z "$selfcheck" ] && selfcheck=1800 [ -z "$Foreground" ] && Foreground=false [ -z "$Debug" ] && Debug=false @@ -240,6 +239,17 @@ [ -z "$HeuristicScanPrecedence" ] && HeuristicScanPrecedence=false [ -z "$StructuredDataDetection" ] && StructuredDataDetection=false + if [ -n "$TemporaryDirectory" ]; then + cat >> $DEBCONFFILE << EOF +TemporaryDirectory $TemporaryDirectory +EOF + else + cat >> $DEBCONFFILE << EOF +# TemporaryDirectory is not set to its default /tmp here to make overriding +# the default with environment variables TMPDIR/TMP/TEMP possible +EOF + fi + cat >> $DEBCONFFILE << EOF User $user AllowSupplementaryGroups $AllowSupplementaryGroups @@ -260,7 +270,6 @@ LogVerbose $LogVerbose PidFile $PidFile DatabaseDirectory $DatabaseDirectory -TemporaryDirectory $TemporaryDirectory SelfCheck $selfcheck Foreground $Foreground Debug $Debug diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.dirs clamav-0.94.dfsg.1/debian/clamav-daemon.dirs --- clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-daemon.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -2,6 +2,5 @@ etc/clamav etc/clamav/virusevent.d usr/sbin/ -usr/share/lintian/overrides/ usr/share/bug/clamav-daemon etc/apparmor.d/force-complain diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.init.in clamav-0.94.dfsg.1/debian/clamav-daemon.init.in --- clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.init.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-daemon.init.in 2008-11-12 15:24:52.000000000 -0500 @@ -134,16 +134,8 @@ fi ;; status) - case "$RUNNING" in - 0) log_success_msg "$NAME is running." - ;; - 1) log_warning_msg "$NAME is not running, but pidfile $THEPIDIFILE exists." - ;; - 3) log_failure_msg "$NAME is not running." - ;; - *) log_failure_msg "$NAME is unknown." - ;; - esac + status_of_proc "$DAEMON" "$NAME" + exit $? ;; restart|force-reload) $0 stop diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.overrides clamav-0.94.dfsg.1/debian/clamav-daemon.overrides --- clamav-0.94.dfsg.1~rc1/debian/clamav-daemon.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-daemon.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -clamav-daemon: syntax-error-in-debian-changelog diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav.dirs clamav-0.94.dfsg.1/debian/clamav.dirs --- clamav-0.94.dfsg.1~rc1/debian/clamav.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -1,3 +1,2 @@ usr/bin -usr/share/lintian/overrides/ usr/share/bug/clamav diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.dirs clamav-0.94.dfsg.1/debian/clamav-freshclam.dirs --- clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-freshclam.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -3,5 +3,4 @@ etc/clamav etc/clamav/onupdateexecute.d etc/clamav/onerrorexecute.d -usr/share/lintian/overrides usr/share/bug/clamav-freshclam diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.init.in clamav-0.94.dfsg.1/debian/clamav-freshclam.init.in --- clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.init.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-freshclam.init.in 2008-11-12 15:24:52.000000000 -0500 @@ -145,16 +145,8 @@ skip) ;; status) - case "$RUNNING" in - 0) log_success_msg "$NAME is running." - ;; - 1) log_warning_msg "$NAME is not running, but pidfile $PIDFILE exists." - ;; - 3) log_failure_msg "$NAME is not running." - ;; - *) log_failure_msg "$NAME is unknown." - ;; - esac + status_of_proc "$DAEMON" "$NAME" + exit $? ;; *) log_failure_msg "Usage: $0 {no-daemon|start|stop|restart|force-reload|reload-log|skip|status}" >&2 diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.overrides clamav-0.94.dfsg.1/debian/clamav-freshclam.overrides --- clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-freshclam.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -clamav-freshclam: partially-translated-question -clamav-freshclam: syntax-error-in-debian-changelog diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.postinst.in clamav-0.94.dfsg.1/debian/clamav-freshclam.postinst.in --- clamav-0.94.dfsg.1~rc1/debian/clamav-freshclam.postinst.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-freshclam.postinst.in 2008-11-12 15:24:52.000000000 -0500 @@ -213,7 +213,8 @@ [ -n "$OnErrorExecute" ] && echo "OnErrorExecute $OnErrorExecute" >> $DEBCONFILE [ -n "$LocalIPAddress" ] && echo "LocalIPAddress $LocalIPAddress" >> $DEBCONFILE [ -n "$SubmitDetectionStats" ] && echo "SubmitDetectionStats $SubmitDetectionStats" >> $DEBCONFILE - + [ -n "$DetectionStatsCountry" ] && echo "DetectionStatsCountry $DetectionStatsCountry" >> $DEBCONFILE + ucf_cleanup "$FRESHCLAMCONFFILE" ucf_upgrade_check "$FRESHCLAMCONFFILE" "$DEBCONFILE" /var/lib/ucf/cache/:etc:clamav:freshclam.conf rm -f "$DEBCONFILE" diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-milter.dirs clamav-0.94.dfsg.1/debian/clamav-milter.dirs --- clamav-0.94.dfsg.1~rc1/debian/clamav-milter.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-milter.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -1,3 +1,2 @@ etc/mail/m4/ -usr/share/lintian/overrides/ usr/share/bug/clamav-milter diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-milter.init.in clamav-0.94.dfsg.1/debian/clamav-milter.init.in --- clamav-0.94.dfsg.1~rc1/debian/clamav-milter.init.in 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-milter.init.in 2008-11-12 15:24:52.000000000 -0500 @@ -95,7 +95,7 @@ $SUPERVISOR $SUPERVISORARGS -X "$SUPERVISOR_EXEC" ret=$? fi - if [ $ret = 0 ] && [ "$USE_POSTFIX" = 'yes' ]; then + if [ $ret = 0 ] && [ "$USE_POSTFIX" = 'yes' ] && [ "${SOCKET_PATH#inet}" = "${SOCKET_PATH}" ]; then cnt=0 until [ -e "$SOCKET_PATH" ] ; do cnt=`expr "$cnt" + 1` @@ -160,16 +160,8 @@ $0 start ;; status) - case "$RUNNING" in - 0) log_success_msg "$BASENAME is running." - ;; - 1) log_warning_msg "$BASENAME is not running, but pidfile $PIDFILE exists." - ;; - 3) log_failure_msg "$BASENAME is not running." - ;; - *) log_failure_msg "$BASENAME is unknown." - ;; - esac + status_of_proc "$DAEMON" "$NAME" + exit $? ;; *) log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2 diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav-milter.overrides clamav-0.94.dfsg.1/debian/clamav-milter.overrides --- clamav-0.94.dfsg.1~rc1/debian/clamav-milter.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav-milter.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -clamav-milter: syntax-error-in-debian-changelog diff -Nru clamav-0.94.dfsg.1~rc1/debian/clamav.overrides clamav-0.94.dfsg.1/debian/clamav.overrides --- clamav-0.94.dfsg.1~rc1/debian/clamav.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/clamav.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -clamav: syntax-error-in-debian-changelog diff -Nru clamav-0.94.dfsg.1~rc1/debian/control clamav-0.94.dfsg.1/debian/control --- clamav-0.94.dfsg.1~rc1/debian/control 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/control 2008-11-12 15:24:52.000000000 -0500 @@ -2,8 +2,8 @@ Section: utils Priority: optional Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: Stephen Gran -Uploaders: Thomas Lamy +XSBC-Original-Maintainer: ClamAV Team +Uploaders: Stephen Gran , Michael Meskes , Michael Tautschnig Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), po-debconf, zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, perl, bc, check Standards-Version: 3.8.0 @@ -69,7 +69,7 @@ on libclamav5, which can be used by other software. . This package contains the command line interface. Features: - - built-in support for various archive formats, including Zip, RAR, Tar, + - built-in support for various archive formats, including Zip, Tar, Gzip, Bzip2, OLE2, Cabinet, CHM, BinHex, SIS and others; - built-in support for almost all mail file formats; - built-in support for ELF executables and Portable Executable files @@ -124,7 +124,7 @@ Package: clamav-daemon Architecture: any -Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), ucf +Depends: ${shlibs:Depends}, clamav-base (= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13), ucf Recommends: apparmor (>= 2.1+1075-0ubuntu6) Suggests: daemon, clamav-docs Description: anti-virus utility for Unix - scanner daemon @@ -165,7 +165,7 @@ Provides: clamav-data Recommends: apparmor (>= 2.1+1075-0ubuntu6) Suggests: clamav-docs -Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0) +Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>= 3.2-13) Description: anti-virus utility for Unix - virus database update utility Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this software is the integration with mail servers (attachment @@ -184,7 +184,7 @@ Suggests: daemon, clamav-docs Priority: extra Recommends: clamav-daemon -Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0) +Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13) Description: anti-virus utility for Unix - sendmail integration Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this software is the integration with mail servers (attachment diff -Nru clamav-0.94.dfsg.1~rc1/debian/libclamav-dev.dirs clamav-0.94.dfsg.1/debian/libclamav-dev.dirs --- clamav-0.94.dfsg.1~rc1/debian/libclamav-dev.dirs 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/libclamav-dev.dirs 2008-11-12 15:24:52.000000000 -0500 @@ -1,4 +1,3 @@ usr/bin/ usr/lib/ usr/lib/pkgconfig/ -usr/share/lintian/overrides/ diff -Nru clamav-0.94.dfsg.1~rc1/debian/libclamav-dev.overrides clamav-0.94.dfsg.1/debian/libclamav-dev.overrides --- clamav-0.94.dfsg.1~rc1/debian/libclamav-dev.overrides 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/libclamav-dev.overrides 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -libclamav-dev: syntax-error-in-debian-changelog diff -Nru clamav-0.94.dfsg.1~rc1/debian/po/eu.po clamav-0.94.dfsg.1/debian/po/eu.po --- clamav-0.94.dfsg.1~rc1/debian/po/eu.po 1969-12-31 19:00:00.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/po/eu.po 2008-11-12 15:24:52.000000000 -0500 @@ -0,0 +1,468 @@ +# translation of clamav-eu.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide , 2008. +msgid "" +msgstr "" +"Project-Id-Version: clamav-eu\n" +"Report-Msgid-Bugs-To: sgran@debian.org\n" +"POT-Creation-Date: 2007-10-21 16:58+0100\n" +"PO-Revision-Date: 2008-09-24 11:03+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../clamav-freshclam.templates:2001 +msgid "daemon" +msgstr "deabrua" + +#. Type: select +#. Choices +#: ../clamav-freshclam.templates:2001 +msgid "manual" +msgstr "eskuz" + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:2002 +msgid "Virus database update method:" +msgstr "Birusa datu-base eguneraketa metodoa:" + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:2002 +msgid "Please choose the method for virus database updates." +msgstr "Mesedez hautatu birus datu-base eguneraketa metodoa." + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:2002 +msgid "" +" daemon: freshclam is running as a daemon all the time. You should choose\n" +" this option if you have a permanent network connection;\n" +" ifup.d: freshclam will be running as a daemon as long as your Internet\n" +" connection is up. Choose this one if you use a dialup Internet\n" +" connection and don't want freshclam to initiate new connections;\n" +" cron: freshclam is started from cron. Choose this if you want full control\n" +" of when the database is updated;\n" +" manual: no automatic invocation of freshclam. This is not recommended,\n" +" as ClamAV's database is constantly updated." +msgstr "" +" daemon: freshclam deabru gisa denbora guztian abiarazirik egongo da. Aukera\n" +" hau hautatu internetera konexio iraunkor bat baduzu;\n" +" ifup.d: freshclam deabru bezala abiaraziko da internet konexioa martxan duzunean.\n" +" Aukera hau hautatu modem bidezko konexio bat baduzu eta ez baduzu\n" +" freshclam-ek konexioa abiaraztea nahi;\n" +" cron: freshclam cron bidez abiaraziko da. Aukera hau hautatu datu-basea noiz\n" +" bertsio-berritzenden kontrolatu nahi baduzu;\n" +" eskuz: Ez da freshclam automatikoki abiaraziko. Hau ez da gomendagarria,\n" +" ClamAV datu-basea oso sarri eguneratzen da eta." + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:3001 +msgid "Local database mirror site:" +msgstr "Datu-base lokal ispilu gunea:" + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:3001 +msgid "Please select the closest local mirror site." +msgstr "Mesedez hautatu gertuen duzun ispiluaten gunea." + +#. Type: select +#. Description +#: ../clamav-freshclam.templates:3001 +msgid "Freshclam updates its database from a world wide network of mirror sites. Please select the closest mirror. If you leave the default setting, an attempt will be made to guess a nearby mirror." +msgstr "Freshclam-ek bere datu-base saretan banaturik dauden ispilu guneetatik eguneratzen du. Mesedez hautatu zutaz gertuen dagoen ispilua. Lehenetsitako ezarpena uzten baduzu, gertuen duzun ispilua asmatzeko saiakera egingo da." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:4001 +msgid "HTTP proxy information (leave blank for none):" +msgstr "HTTP proxy-a argibideak (hutsi utzi ez erabiltzeko):" + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:4001 +msgid "If you need to use an HTTP proxy to access the outside world, enter the proxy information here. Otherwise, leave this blank." +msgstr "Sarea atzitzeko HTTP proxy bat behar izanez gero, idatzi proxy-aren argibideak hemen. Bestela zurian utzi ezazu." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:4001 +msgid "Please use URL syntax (\"http://host[:port]\") here." +msgstr "Mesedez URL sintaxia (\"http://ostalari[:ataka]\") erabili hemen." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:5001 +msgid "Proxy user information (leave blank for none):" +msgstr "Proxy erabiltzaile argibidea (zurian ez erabiltzeko):" + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:5001 +msgid "If you need to supply a username and password to the proxy, enter it here. Otherwise, leave this blank." +msgstr "Proxy-a erabiltzeko erabiltzaile-izen bat zehaztu behar baduzu, idatz ezazu hemen. Bestela zurian utzi ezazu." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:5001 +msgid "When entering user information, use the standard form of \"user:pass\"." +msgstr "Erabiltzaile argibideak ezartzerakoan, \"erabiltzaile:pasahitza\" estandarra erabili." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:6001 +msgid "Number of freshclam updates per day:" +msgstr "Eguneko freshclam eguneraketa kopurua:" + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:7001 +msgid "Network interface connected to the Internet:" +msgstr "Internetera konektaturik dagoen sare interfazea:" + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:7001 +msgid "Please enter the name of the network interface connected to the Internet. Example: eth0." +msgstr "Mesedez ezarri internetera konektaturik dagoen sare interfazearen izena. Adibidez: eth0." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:7001 +msgid "If the daemon runs when the network is down, the log file will be filled with entries like 'ERROR: Connection with database.clamav.net failed.', making it easy to miss when freshclam really can't update the database." +msgstr "Sarea deskonektaturik dagoela deabrua abiarazten bada erregistro fitxategia 'ERROR: Connection with database.clamav.net failed.' moduko erregistroz beteko da, freshclam-ek bertsio-berritzeko benetako arazoak dituen ikustea zailtzen." + +#. Type: string +#. Description +#: ../clamav-freshclam.templates:7001 +msgid "You can leave this field blank and the daemon will be started from the initialization scripts instead. You should then make sure the computer is permanently connected to the Internet to avoid filling the log files." +msgstr "Eremu hau zurian uzten baduzu deabrua abio script-ek exekutatuko dute. Erregistro fitxategiak betetzea saihesteko beti internetera konektaturik zaudela ziurtatu beharko zenuke." + +#. Type: boolean +#. Description +#: ../clamav-freshclam.templates:8001 +msgid "Should clamd be notified after updates?" +msgstr "Bertsio-berritzeen ondoren clamd ohartu egin behar al da?" + +#. Type: boolean +#. Description +#: ../clamav-freshclam.templates:8001 +msgid "Please confirm whether clamd should be notified to reload the database after successful updates." +msgstr "Mesedez berretsi datu-basea birkargatzeko clamd ohartu egin behar dela bertsio-berritzeen ondoren." + +#. Type: boolean +#. Description +#: ../clamav-freshclam.templates:8001 +msgid "If you do not choose this option, clamd's database reloads will be notably delayed (it performs this check every 6 hours by default), posing the risk that a new virus may slip through even if the database is up to date. Do not use this if you do not use clamd, as it will produce errors." +msgstr "Aukera hau hautatzen ez baduzu birkarga horiek beranduago egingo dira (egiaztapena 6 orduro egiten da), nahiz datu-basea eguneraturik izan birus baten erasoaren aukera emanez. Ez erabili aukera hau ez baduzu clamd erabiltzen, horrela erabiltzeak erroreak sortzen ditu." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:2001 +msgid "Handle the configuration file automatically?" +msgstr "Kudeatu konfigurazio fitxategia automatikoki?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:2001 +msgid "Some options must be configured for clamav-base." +msgstr "Zenbait aukera konfiguratu egin behar dira clamav-base-rentzat." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:2001 +msgid "The ClamAV suite won't work if it isn't configured. If you do not configure it automatically, you'll have to configure /etc/clamav/clamd.conf manually or run 'dpkg-reconfigure clamav-base' later. In any case, manual changes in /etc/clamav/clamd.conf will be respected." +msgstr "Clamav suiteak ez du funtzionatuko konfiguraturik ez badago. Ez baduzu konfigurazio automatikoa egiten, /etc/clamav/clamd.conf eskuz konfiguratu edo beranduago 'dpkg-reconfigure clamav-base' exekutatu beharko duzu. Edozein kasutan /etc/clamav/clamd.conf fitxategiak izan ditzakeen pertsonalizazioak errespetatu egingo dira." + +#. Type: select +#. Description +#: ../clamav-base.templates:3001 +msgid "Socket type:" +msgstr "Socket mota:" + +#. Type: select +#. Description +#: ../clamav-base.templates:3001 +msgid "Please choose the type of socket clamd will be listening on." +msgstr "Mesedez hautatu clamd-ek entzungo duen socket mota." + +#. Type: select +#. Description +#: ../clamav-base.templates:3001 +msgid "If you choose TCP, clamd can be accessed remotely. If you choose local UNIX sockets, clamd can be accessed through a file. Local UNIX sockets are recommended for security reasons." +msgstr "TCP hautatzen baduzu clamd urrunetik atzitu ahal izango da. UNIX socket lokalak hautatzen badituzu, clamd fitxategi baten bitartez atzitu ahal izango da. Segurtasun arrazoiak direla eta UNIX socket lokalak erabiltzea gomendatzen da." + +#. Type: string +#. Description +#: ../clamav-base.templates:4001 +msgid "Local (UNIX) socket clamd will listen on:" +msgstr "Clamd entzuten egon behar den socket lokala (UNIX):" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:5001 +msgid "Gracefully handle left-over UNIX socket files?" +msgstr "Utzitako UNIX socket fitxategiak deabruak kudeatzea nahi al duzu?" + +#. Type: string +#. Description +#: ../clamav-base.templates:6001 +msgid "TCP port clamd will listen on:" +msgstr "Clamd-ek entzun behar duen TCP ataka:" + +#. Type: string +#. Description +#: ../clamav-base.templates:7001 +msgid "IP address clamd will listen on:" +msgstr "Clamd-ek entzun behar duen IP helbidea:" + +#. Type: string +#. Description +#: ../clamav-base.templates:7001 +msgid "Enter \"any\" to listen on every IP address configured. If you want to listen on a single address or host name, enter it here." +msgstr "\"any\" idatzi konfiguraturik duzun edoizen IP helbidetan entzuteko. Helbide edo ostalari izen bakar jakin batez bakarrik entzun nahi baduzu, idatzi berau hemen." + +#. Type: error +#. Description +#: ../clamav-base.templates:8001 +msgid "Mandatory numeric value" +msgstr "Derrigorrezko zenbakizko balioa" + +#. Type: error +#. Description +#: ../clamav-base.templates:8001 +msgid "This question requires a numeric answer." +msgstr "Galdera honek zenbakizko erantzun bat behar du." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:9001 +msgid "Do you want to enable mail scanning?" +msgstr "Posta eskaneatzea gaitu nahi al duzu?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:9001 +msgid "This option enables scanning mail contents for viruses. You need this option enabled if you want to use clamav-milter. It is recommended that you use a separate unpacker to extract any MIME parts of email messages if you want to scan email." +msgstr "Aukera honek birus bila eposta arakatzea gaitzen du. Aukera hau gaiturik izan behar duzu clamav-milter erabili nahi baduzu. Gomendagarria da eposta mezuen edozien MIME zati ateratzeko despaketatzaile ezberdin bat erabiltzea." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:10001 +msgid "Do you want to enable archive scanning?" +msgstr "Artxibo eskaneatzea gaitu nahi al duzu?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:10001 +msgid "If archive scanning is enabled, the daemon will extract archives such as bz2, tar.gz, deb and many more, to check their contents for viruses." +msgstr "Artxibo arakatzea gaiturik badago, deabruak bz2, tar.gz, deb eta mota gehiagotako artxiboetako fitxategiak atera egingo ditu birus bila arakatzeko." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:10001 +msgid "For more information about what archives are supported, see /usr/share/doc/clamav-docs/clamdoc.pdf or the manpage clamscan(5)." +msgstr "Onartzen diren artxibo motei buruz argibide gehiagorako, /usr/share/doc/clamav-docs/clamdoc.pdf edo clamscan(5) manual orria irakurri." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:11001 +msgid "Do you want to enable RAR archive scanning?" +msgstr "RAR artxibo arakatzea gaitu nahi al duzu?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:11001 +msgid "This enables the builtin RAR archiver. Use with caution, as the RAR code may have memory leaks. Clamscan can also use external RAR programs, such as unrar, although clamd does not." +msgstr "Honek barneratutako RAR artxibatzailea gaitzen du. Kontuz erabili RAR kodeak memoria galerak bait ditu. Clamscan-ek unrar moduko RAR programak erabili ditzake baina clamd ez da horiek erabiltzeko gai." + +#. Type: string +#. Description +#: ../clamav-base.templates:12001 +msgid "Maximum stream length (unit Mb) allowed:" +msgstr "Onartzen den gehienezko korronte tamaina (unitate Mb):" + +#. Type: string +#. Description +#: ../clamav-base.templates:12001 +msgid "You can set a limit on the stream length that can be scanned." +msgstr "Arakatuko den korrontearen gehienezko tamaina ezarri dezakezu." + +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: string +#. Description +#: ../clamav-base.templates:12001 +#: ../clamav-base.templates:13001 +#: ../clamav-base.templates:14001 +#: ../clamav-base.templates:16001 +#: ../clamav-base.templates:17001 +msgid "Entering '0' will disable this limit." +msgstr "'0' ezarriaz gero muga hau ezgaituko da." + +#. Type: string +#. Description +#: ../clamav-base.templates:13001 +msgid "Limit on the Archive recursion:" +msgstr "Artxibo errekurtsio muga:" + +#. Type: string +#. Description +#: ../clamav-base.templates:13001 +msgid "This setting places a limit on recursion within archives, for example, a tar file that is also gzipped." +msgstr "Ezarpen honek artxibo barruko errekurtsio kopurua mugatzen du, adibidez gzip bidez konprimituriko tar fitxategi bat." + +#. Type: string +#. Description +#: ../clamav-base.templates:14001 +msgid "Limit on Archive compression:" +msgstr "Artxibo konpresio muga:" + +#. Type: string +#. Description +#: ../clamav-base.templates:14001 +msgid "This setting places a limit on compression within archives, to guard against archive bombs (small files that expand to massive ones, a form of Denial of Service attack). However, this limit may be too low for some settings." +msgstr "Balio honek artxiboetan onartzen den konpresio muga ezartzen du artxibo-bonba (fitxaegi handietan irekitzen diren fitxategi txikiak, zerbitzu-ukatze eraso modu bat izan daitezkeenak) erasoak saihesteko. HAla ere, ezarpena hau baxuegia izan daiteke konfigurazio batzuentzat." + +#. Type: string +#. Description +#: ../clamav-base.templates:15001 +msgid "Limit for the maximum number of files in an archive:" +msgstr "Artxibo baten fitxategi kopuruaren muga:" + +#. Type: string +#. Description +#: ../clamav-base.templates:16001 +msgid "Largest file size in Mb you will scan inside archives:" +msgstr "Arakatuko den artxibo barruko fitxategien gehienezko tamaina Mb-etan:" + +#. Type: string +#. Description +#: ../clamav-base.templates:17001 +msgid "Maximum directory depth that will be allowed:" +msgstr "Onartzen den gehienezko direktorioa sakontasuna:" + +#. Type: string +#. Description +#: ../clamav-base.templates:17001 +msgid "This value must be set if you want to allow the daemon to follow directory symlinks." +msgstr "Balio hau ezarri behar da deabruak direktorio lotura sinbolikoak jarraitzen nahi baduzu." + +#. Type: boolean +#. Description +#: ../clamav-base.templates:18001 +msgid "Do you want the daemon to follow directory symlinks?" +msgstr "Deabruak direktorio lotura sinbolikoak jarraitzea nahi al duzu?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:19001 +msgid "Do you want the daemon to follow regular file symlinks?" +msgstr "Deabruak fitxategi lotura sinboliko arruntak jarraitzea nahi al duzu?" + +#. Type: string +#. Description +#: ../clamav-base.templates:20001 +msgid "Timeout for stopping the thread-scanner (seconds):" +msgstr "Harizko arakatzea gelditzeko denboraz-kanpo muga (segundutan):" + +#. Type: string +#. Description +#: ../clamav-base.templates:20001 +msgid "Entering '0' will disable the timeout." +msgstr " '0' ezarriaz denboraz-kanpo muga desgaituko da." + +#. Type: string +#. Description +#: ../clamav-base.templates:21001 +msgid "Number of threads for the daemon:" +msgstr "Deabruaren hari kopurua:" + +#. Type: string +#. Description +#: ../clamav-base.templates:22001 +msgid "Number of pending connections allowed:" +msgstr "Onartzen diren burutu gabeko konexio kopurua:" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:23001 +msgid "Do you want to use the system logger?" +msgstr "Sistemako erregistroa erabili nahi al duzu?" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:23001 +msgid "It is possible to log the daemon activity to the system logger. This can be done independently of whether you want to log activity to a special file." +msgstr "Posible da deabru aktibitatea sistema erregistroan erregistratzea. Hau aktibitatea beste fitxategi batetan gordetzen edo gorde gabe egin daiteke." + +#. Type: string +#. Description +#: ../clamav-base.templates:24001 +msgid "Log file for clamav-daemon (enter none to disable):" +msgstr "Clamav-daemon erregistro fitxategia (ez idatzi ezer desgaitzeko):" + +#. Type: boolean +#. Description +#: ../clamav-base.templates:25001 +msgid "Do you want to log time information with each message?" +msgstr "Mezu bakoitzarekin ordu informazioa erregistratzea nahi duzu?" + +#. Type: string +#. Description +#: ../clamav-base.templates:26001 +msgid "Delay in seconds between daemon self checks:" +msgstr "Deabruaren auto-egiaztapenen arteko tartea segundutan:" + +#. Type: string +#. Description +#: ../clamav-base.templates:26001 +msgid "During the SelfCheck the daemon checks if it needs to reload the virus database. It also tries to repair problems caused by bugs in the daemon, (that is, in some cases it's able to repair broken data structures)." +msgstr "Auto-egiaztapenean deabruak datu-basea birkargatu behar duen egiaztatzen du. Deabruaren programa-erroreek sortutako arazoak konpontzen ere saiatzen da, adibidez posible izango da Hondatutako datu estrukturak konpontzea kasu batzuetan." + +#. Type: string +#. Description +#: ../clamav-base.templates:27001 +msgid "User to run clamav-daemon as:" +msgstr "Clamav-deamon exekutatzeko erabiltzailea:" + +#. Type: string +#. Description +#: ../clamav-base.templates:27001 +msgid "It is recommended to run the ClamAV programs as a non-privileged user. This will work with most MTAs with a little tweaking, but if you want to use clamd for filesystem scans, running as root is probably unavoidable. Please see README.Debian in the clamav-base package for details." +msgstr "Gomendagarria da ClamAV programak pribilegio gabeko erabiltzaile gisa abiaraztea. Honek behar bezala funtzionatzen du posta garraio sistema (MTA) gehienekin baina posible da root gisa exekutatu behar izatea fitxategi sistemak arakatu nahi badituzu. Irakurri clamav-base paketeko README.Debian fitxategia xehetasun gehiagorako." + +#. Type: string +#. Description +#: ../clamav-base.templates:28001 +msgid "Groups for clamav-daemon (space-separated):" +msgstr "Clamav-deamon taldeak (zuriunez bereizirik):" + +#. Type: string +#. Description +#: ../clamav-base.templates:28001 +msgid "Please enter any extra groups for clamd." +msgstr "Mesedez idatzi clamd-rentzat talde gehiagarri bat." + +#. Type: string +#. Description +#: ../clamav-base.templates:28001 +msgid "By default, clamd runs as a non-privileged user. If you need clamd to be able to access files owned by another user (e.g., in combination with an MTA), then you will need to add clamd to the group for that piece of software. Please see README.Debian in the clamav-base package for details." +msgstr "Lehenespen bezala clamd pribilegio gabeko erabiltzaile gisa exekutatzen da. Beste erabiltzaile baten jabetzapean dauden fitxategiak arakatzea nahi baduzu (adibidez MTA batekin erabiltzeko) clamd software horren taldera gehitu beharko duzu.Irakurri clamav-base paketeko README.Debian fitxategia xehetasun gehiagorako." + diff -Nru clamav-0.94.dfsg.1~rc1/debian/po/nl.po clamav-0.94.dfsg.1/debian/po/nl.po --- clamav-0.94.dfsg.1~rc1/debian/po/nl.po 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/po/nl.po 2008-11-12 15:24:52.000000000 -0500 @@ -1,3 +1,4 @@ +# translation of clamav_0.94.dfsg-1_nl.po to Dutch # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -11,60 +12,48 @@ # # Developers do not need to manually edit POT or PO files. # +# Paul Gevers , 2008. msgid "" msgstr "" -"Project-Id-Version: clamav 0.88.2-1\n" +"Project-Id-Version: clamav_0.94.dfsg-1_nl\n" "Report-Msgid-Bugs-To: sgran@debian.org\n" "POT-Creation-Date: 2007-10-21 16:58+0100\n" -"PO-Revision-Date: 2006-05-28 17:27+0100\n" -"Last-Translator: Vincent Zweije \n" -"Language-Team: Debian Dutch \n" +"PO-Revision-Date: 2008-10-06 22:09-0600\n" +"Last-Translator: Paul Gevers \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: select #. Choices #: ../clamav-freshclam.templates:2001 msgid "daemon" -msgstr "" +msgstr "achtergronddienst" #. Type: select #. Choices #: ../clamav-freshclam.templates:2001 msgid "manual" -msgstr "" +msgstr "handmatig" #. Type: select #. Description #: ../clamav-freshclam.templates:2002 msgid "Virus database update method:" -msgstr "Methode voor bijwerken van virusgegevensbank:" +msgstr "Methode voor het bijwerken van de virusdatabase:" #. Type: select #. Description #: ../clamav-freshclam.templates:2002 msgid "Please choose the method for virus database updates." -msgstr "Kies een methode voor het bijwerken van de virusgegevensbanken." +msgstr "Welke methode wilt u voor het bijwerken van de virusdatabase?" #. Type: select #. Description #: ../clamav-freshclam.templates:2002 -#, fuzzy -#| msgid "" -#| " daemon : freshclam is running as a daemon all the time. You should " -#| "choose\n" -#| " this option if you have a permanent network connection.\n" -#| " ifup.d : freshclam will be running as a daemon as long as your Internet\n" -#| " connection is up. Choose this one if you have a dialup " -#| "Internet\n" -#| " connection and don't want freshclam to initiate new " -#| "connections.\n" -#| " cron : freshclam is started from cron. Choose if you want full " -#| "control\n" -#| " of when the database is updated.\n" -#| " manual : No automatic invocation of freshclam. This is not recommended,\n" -#| " as clamav's database is constantly updated." msgid "" " daemon: freshclam is running as a daemon all the time. You should choose\n" " this option if you have a permanent network connection;\n" @@ -77,71 +66,59 @@ " manual: no automatic invocation of freshclam. This is not recommended,\n" " as ClamAV's database is constantly updated." msgstr "" -" achtergronddienst : freshclam draait continu als een achtergronddienst. U\n" -" dient deze optie te kiezen als u een permanente internetverbinding\n" -" heeft.\n" -" ifup.d : freshclam draait alleen als u een verbinding heeft met internet. " -"Kies\n" -" deze optie als u een inbelverbinding heeft met het internet en niet " -"wilt\n" -" dat freshclam zelf nieuwe verbindingen maakt.\n" -" cron : freshclam wordt gestart door cron. Kies deze optie als u volledige\n" -" controle wilt hebben over wanneer de gegevensbank bijgewerkt " -"wordt.\n" -" handmatig : Freshclam wordt niet automatisch bijgewerkt. Dit wordt niet\n" -" aangeraden, omdat clamav's gegevensbank continu wordt bijgewerkt." +" achtergronddienst: freshclam draait continu als een achtergronddienst. \n" +" Als u een permanente internetverbinding heeft, wordt deze optie \n" +" aanbevolen.\n" +" ifup.d: freshclam draait alleen als u een verbinding heeft met\n" +" internet. U kiest deze optie als u een inbelverbinding heeft\n" +" met het internet en niet wilt dat freshclam zelf nieuwe\n" +" verbindingen maakt.\n" +" cron: freshclam wordt gestart door cron. U kiest deze optie als u\n" +" volledige controle wilt hebben over wanneer de database\n" +" bijgewerkt wordt.\n" +" handmatig: freshclam wordt niet automatisch bijgewerkt. Dit wordt niet\n" +" aangeraden, omdat de online database van clamav continu wordt\n" +" bijgewerkt." #. Type: select #. Description #: ../clamav-freshclam.templates:3001 msgid "Local database mirror site:" -msgstr "Dichtsbijzijnde gegevensbank-mirror:" +msgstr "Dichtstbijzijnde database-mirror:" #. Type: select #. Description #: ../clamav-freshclam.templates:3001 msgid "Please select the closest local mirror site." -msgstr "Selecteer de dichtstbijzijnde mirror." +msgstr "Wat is de dichtstbijzijnde mirror?" #. Type: select #. Description #: ../clamav-freshclam.templates:3001 -#, fuzzy -#| msgid "" -#| "Freshclam updates its database from a world wide network of mirror " -#| "sites. Please select the mirror closest to you. If you leave it at the " -#| "default setting, an attempt will be made to provide you with a nearby " -#| "mirror, but this attempt may not always provide you with the closest " -#| "mirror site." msgid "" "Freshclam updates its database from a world wide network of mirror sites. " "Please select the closest mirror. If you leave the default setting, an " "attempt will be made to guess a nearby mirror." msgstr "" -"Freshclam werkt zijn gegevensbank bij via een wereldwijd netwerk van " -"mirrors. Selecteer de dichtstbijzijnde mirror. Als u het op de " -"standaardwaarde laat staan, zal geprobeerd worden om de u mirror in de buurt " -"te geven. Dit zal niet altijd de dichtstbijzijnde opleveren." +"Freshclam werkt zijn database bij via een wereldwijd netwerk van mirrors. " +"Wilt u de dichtstbijzijnde mirror kiezen? Als u de standaardwaarde laat " +"staan, zal geprobeerd worden om een mirror in uw buurt te vinden." #. Type: string #. Description #: ../clamav-freshclam.templates:4001 msgid "HTTP proxy information (leave blank for none):" -msgstr "HTTP-proxy-gegevens (laat leeg voor geen):" +msgstr "HTTP-proxy-gegevens (leeglaten indien niet van toepassing):" #. Type: string #. Description #: ../clamav-freshclam.templates:4001 -#, fuzzy -#| msgid "" -#| "If you need to use a HTTP proxy to access the outside world, enter the " -#| "proxy information here. Otherwise, leave this blank." msgid "" "If you need to use an HTTP proxy to access the outside world, enter the " "proxy information here. Otherwise, leave this blank." msgstr "" -"Als u een HTTP-proxy nodig heeft om de buitenwereld te bereiken, dient u de " -"proxy-gegevens hier op te geven. Laat anders leeg." +"Als u een HTTP-proxy nodig heeft om op het internet te komen, dient u de " +"proxy-gegevens hier op te geven." #. Type: string #. Description @@ -153,7 +130,7 @@ #. Description #: ../clamav-freshclam.templates:5001 msgid "Proxy user information (leave blank for none):" -msgstr "Gebruikergegevens voor proxy (laat leeg voor geen):" +msgstr "Gebruikergegevens voor proxy (leeglaten indien niet van toepassing):" #. Type: string #. Description @@ -162,19 +139,16 @@ "If you need to supply a username and password to the proxy, enter it here. " "Otherwise, leave this blank." msgstr "" -"Als u de proxy van een gebruikersnaam en wachtwoord moet voorzien, dient u " -"ze hier op te geven. Laat anders leeg." +"Wilt u de gebruikersnaam en het wachtwoord opgeven voor de proxy, indien dat " +"nodig is?" #. Type: string #. Description #: ../clamav-freshclam.templates:5001 -#, fuzzy -#| msgid "" -#| "When entering user information, use the standard form of \"user:pass\"" msgid "When entering user information, use the standard form of \"user:pass\"." msgstr "" -"Als u gebruikergegevens opgeeft dient u de standaardvorm \"gebruiker:" -"wachtwoord\" te gebruiken." +"Als u gebruikergegevens opgeeft, gebruikt u de standaardvorm \"gebruiker:" +"wachtwoord\"." #. Type: string #. Description @@ -185,38 +159,31 @@ #. Type: string #. Description #: ../clamav-freshclam.templates:7001 -#, fuzzy -#| msgid "Name of the network interface connected to the Internet:" msgid "Network interface connected to the Internet:" -msgstr "Naam van de netwerkinterface verbonden met het internet:" +msgstr "Naam van de netwerkinterface die verbonden is met het internet:" #. Type: string #. Description #: ../clamav-freshclam.templates:7001 -#, fuzzy -#| msgid "Name of the network interface connected to the Internet:" msgid "" "Please enter the name of the network interface connected to the Internet. " "Example: eth0." -msgstr "Naam van de netwerkinterface verbonden met het internet:" +msgstr "" +"Wat is de naam van de netwerkinterface die verbonden is met het internet " +"opgeven? Bijvoorbeeld: eth0." #. Type: string #. Description #: ../clamav-freshclam.templates:7001 -#, fuzzy -#| msgid "" -#| "If the daemon runs when the network is down the log file is filled with a " -#| "lot of entries like 'ERROR: Connection with database.clamav.net failed.', " -#| "making it easy to miss when freshclam really can't update the database." msgid "" "If the daemon runs when the network is down, the log file will be filled " "with entries like 'ERROR: Connection with database.clamav.net failed.', " "making it easy to miss when freshclam really can't update the database." msgstr "" -"Als de achtergronddienst draait als er geen verbinding met het netwerk is, " -"zal het logbestand gevuld worden met regels als 'ERROR: Connection with " -"database.clamav.net failed.'. Dit verhoogt de kans dat u het niet door heeft " -"als freshclam echt de database niet kan bijwerken." +"Als de achtergronddienst draait terwijl er geen verbinding met het netwerk " +"is, zal het logbestand gevuld worden met regels zoals 'ERROR: Connection " +"with database.clamav.net failed.'. U loopt hiermee het risico dat u het niet " +"door heeft als freshclam echt problemen heeft om de database bij te werken." #. Type: string #. Description @@ -226,12 +193,16 @@ "initialization scripts instead. You should then make sure the computer is " "permanently connected to the Internet to avoid filling the log files." msgstr "" +"Als u dit veld leeg laat zal de achtergronddienst vanuit het initialisatie " +"script worden opgestart. In dat geval verdient het de aanbeveling om ervoor " +"te zorgen dat uw computer permanent met internet verbonden is om te " +"voorkomen dat de logbestanden vollopen." #. Type: boolean #. Description #: ../clamav-freshclam.templates:8001 msgid "Should clamd be notified after updates?" -msgstr "Moet clamd gewaarschuwd worden na het bijwerken?" +msgstr "Wilt u dat clamd gewaarschuwd wordt na het bijwerken?" #. Type: boolean #. Description @@ -240,56 +211,45 @@ "Please confirm whether clamd should be notified to reload the database after " "successful updates." msgstr "" -"Geef aan of clamd gewaarschuwd moet worden dat het zijn database moet " -"herladen nadat deze succesvol is bijgewerkt." +"Wilt u dat clamd gewaarschuwd wordt dat het zijn database moet herladen " +"nadat deze succesvol is bijgewerkt?" #. Type: boolean #. Description #: ../clamav-freshclam.templates:8001 -#, fuzzy -#| msgid "" -#| "If you do not choose this option, clamd's database reloads will be " -#| "notably delayed (it performs this check every 6 hours by default), posing " -#| "the risk that a new virus may slip through although your database is up " -#| "to date. Do not use this if you do not use clamd, as it will produce " -#| "errors." msgid "" "If you do not choose this option, clamd's database reloads will be notably " "delayed (it performs this check every 6 hours by default), posing the risk " "that a new virus may slip through even if the database is up to date. Do not " "use this if you do not use clamd, as it will produce errors." msgstr "" -"Als u kiest dit niet te doen zal het herladen van clamd's gegevensbank " -"merkbare vertraging oplopen (clamd controleert dit standaard elke 6 uur). " -"Dit brengt het risico met zich mee dat een nieuw virus niet gedetecteerd " -"wordt terwijl uw database al volledig is bijgewerkt. Gebruik deze instelling " -"alleen als u clamd gebruikt, anders genereert het fouten." +"Als u ervoor kiest om dit niet te doen zal het herladen van de database door " +"clamd merkbare vertraging oplopen (standaard controleert clamd de database " +"elke 6 uur). Dit brengt het risico met zich mee dat een nieuw virus niet " +"gedetecteerd wordt, terwijl uw database al volledig is bijgewerkt. Als u " +"deze instelling aanzet zonder dat u clamd gebruikt, dan zal dit fouten " +"opleveren." #. Type: boolean #. Description #: ../clamav-base.templates:2001 -#, fuzzy -#| msgid "Do you want to handle the configuration file with debconf?" msgid "Handle the configuration file automatically?" -msgstr "Wilt u het configuratiebestand met debconf afhandelen?" +msgstr "Wilt u het configuratiebestand automatisch laten afhandelen?" #. Type: boolean #. Description #: ../clamav-base.templates:2001 -#, fuzzy -#| msgid "There are quite a few options to be configured for clamav-base." msgid "Some options must be configured for clamav-base." -msgstr "" -"Clamav-daemon heeft behoorlijk veel opties die ingesteld kunnen worden." +msgstr "Enkele instellingen van clamav-base dienen geconfigureerd te worden." #. Type: boolean #. Description #: ../clamav-base.templates:2001 #, fuzzy #| msgid "" -#| "The ClamAV suite won't work if it isn't configured. If you don't choose " -#| "debconf you'll have to configure /etc/clamav/clamd.conf manually or run " -#| "'dpkg-reconfigure clamav-base' later. Whether you choose debconf or not, " +#| "The 'clamav' suite won't work if it isn't configured. If you do not " +#| "configure it automatically, you'll have to configure /etc/clamav/clamd." +#| "conf manually or run 'dpkg-reconfigure clamav-base' later. In any case, " #| "manual changes in /etc/clamav/clamd.conf will be respected." msgid "" "The ClamAV suite won't work if it isn't configured. If you do not configure " @@ -297,11 +257,11 @@ "or run 'dpkg-reconfigure clamav-base' later. In any case, manual changes in /" "etc/clamav/clamd.conf will be respected." msgstr "" -"De achtergronddienst zal niet werken als hij niet ingesteld is. Als u kiest " -"om debconf niet te gebruiken, zult u /etc/ clamav/clamd.conf handmatig " -"moeten instellen of later 'dpkg-reconfigure clamav-daemon' moeten uitvoeren. " -"Of u nu debconf kiest of niet, handmatige veranderingen in /etc/clamav.conf " -"zullen altijd ongemoeid gelaten worden." +"Het clamav pakket werkt alleen als het ingesteld is. Als u ervoor kiest om " +"dit niet automatisch te doen, zult u /etc/clamav/clamd.conf handmatig moeten " +"instellen of later 'dpkg-reconfigure clamav-daemon' moeten uitvoeren. Waar u " +"ook voor kiest, handmatige veranderingen in /etc/clamav/clamav.conf zullen " +"altijd ongemoeid gelaten worden." #. Type: select #. Description @@ -313,97 +273,77 @@ #. Description #: ../clamav-base.templates:3001 msgid "Please choose the type of socket clamd will be listening on." -msgstr "Kies het type socket waarop clamd zal luisteren." +msgstr "Naar welk type socket wilt u dat clamd luistert?" #. Type: select #. Description #: ../clamav-base.templates:3001 -#, fuzzy -#| msgid "" -#| "If you choose TCP clamd can be accessed remotely. This choice isn't " -#| "recommended since ClamAV is a very young project. If you choose local " -#| "UNIX sockets, clamd can be accessed through a file." msgid "" "If you choose TCP, clamd can be accessed remotely. If you choose local UNIX " "sockets, clamd can be accessed through a file. Local UNIX sockets are " "recommended for security reasons." msgstr "" -"Als u TCP kiest is clamd op afstand toegankelijk. Dit is niet aan te " -"bevelen, omdat clam nog een heel jong project is. Als u lokale UNIX-sockets " -"kiest kan de clamd worden benaderd via een bestand." +"Als u voor TCP kiest, is clamd op afstand toegankelijk. Als u lokale UNIX-" +"sockets kiest kan de clamd worden benaderd via een bestand. Om " +"veiligheidsredenen worden de lokale UNIX-sockets aangeraden." #. Type: string #. Description #: ../clamav-base.templates:4001 -#, fuzzy -#| msgid "Local (Unix) socket clamd will listen on:" msgid "Local (UNIX) socket clamd will listen on:" -msgstr "Lokaal (Unix-) socket waarop clamd zal luisteren:" +msgstr "Lokale (Unix-) socket waaraan clamd moet luisteren:" #. Type: boolean #. Description #: ../clamav-base.templates:5001 -#, fuzzy -#| msgid "Gracefully handle left-over Unix socket files?" msgid "Gracefully handle left-over UNIX socket files?" -msgstr "Overgebleven UNIX-socketbestanden elegant afhandelen?" +msgstr "" +"Wilt u dat achtergebleven UNIX-socketbestanden elegant worden afhandeld?" #. Type: string #. Description #: ../clamav-base.templates:6001 msgid "TCP port clamd will listen on:" -msgstr "TCP-poort waarop clamd zal luisteren:" +msgstr "TCP-poort waaraan clamd moet luisteren:" #. Type: string #. Description #: ../clamav-base.templates:7001 msgid "IP address clamd will listen on:" -msgstr "IP-adres waarop clamd zal luisteren:" +msgstr "IP-adres waarnaar clamd moet luisteren:" #. Type: string #. Description #: ../clamav-base.templates:7001 -#, fuzzy -#| msgid "" -#| "Enter \"any\" to listen on every IP address configured. If you instead " -#| "want to listen on a single address or hostname, enter that address (e.g. " -#| "\"127.0.0.1\") or hostname." msgid "" "Enter \"any\" to listen on every IP address configured. If you want to " "listen on a single address or host name, enter it here." msgstr "" -"Type \"any\" om te luisteren naar elk geconfigureerd TCP-adres. Als u in " -"plaats daarvan naar één adres of computernaam wilt luisteren, vul dan dat " -"adres (bijv. \"127.0.0.1\") of die computernaam in." +"Als clamd naar elk geconfigureerd TCP-adres moet luisteren, kunt u \"any\" " +"invullen. Als clamd in plaats daarvan naar één adres of computernaam moet " +"luisteren, vult u dan dat adres (bijv. \"127.0.0.1\") of die computernaam in." #. Type: error #. Description #: ../clamav-base.templates:8001 msgid "Mandatory numeric value" -msgstr "" +msgstr "Numerieke waarde verplicht" #. Type: error #. Description #: ../clamav-base.templates:8001 msgid "This question requires a numeric answer." -msgstr "" +msgstr "Deze vraag vereist een numerieke waarde als antwoord." #. Type: boolean #. Description #: ../clamav-base.templates:9001 msgid "Do you want to enable mail scanning?" -msgstr "Wilt u het scannen van e-mail aanzetten?" +msgstr "Wilt u dat e-mail berichten gecontroleerd worden?" #. Type: boolean #. Description #: ../clamav-base.templates:9001 -#, fuzzy -#| msgid "" -#| "This option enables scanning mail contents for viruses. Although this is " -#| "the least stable part of libclamav, you need this option enabled if you " -#| "want to use clamav-milter. It is recommended that you use a separate " -#| "unpacker to extract any MIME parts of email messages if you want to scan " -#| "email." msgid "" "This option enables scanning mail contents for viruses. You need this option " "enabled if you want to use clamav-milter. It is recommended that you use a " @@ -411,46 +351,37 @@ "scan email." msgstr "" "Deze optie stelt de achtergronddienst in staat de inhoud van e-mail te " -"scannen op virussen. Ondanks dat dit het minst stabiele onderdeel is van " -"libclamav, dient u deze optie aan te zetten als u clamav-milter wilt " -"gebruiken. Als u e-mail wilt scannen wordt het aangeraden dat u een " -"losstaande uitpakker gebruikt om een eventueel MIME-gedeelte uit een e-mail " -"te halen." +"controleren op virussen. Als u gebruik wilt maken van clamav-milter dan " +"dient u deze optie te gebruiken. Als u e-mail wilt scannen wordt het " +"aangeraden dat u een losstaande uitpakker gebruikt om een eventueel MIME-" +"gedeelte uit een e-mail te halen." #. Type: boolean #. Description #: ../clamav-base.templates:10001 msgid "Do you want to enable archive scanning?" -msgstr "Wilt u scannen van archieven aanzetten?" +msgstr "Wilt u het scannen van archieven aanzetten?" #. Type: boolean #. Description #: ../clamav-base.templates:10001 -#, fuzzy -#| msgid "" -#| "If archive scanning is enabled, the daemon will extract archives such as " -#| "bz2, tar.gz, deb and many more to check their contents for viruses." msgid "" "If archive scanning is enabled, the daemon will extract archives such as " "bz2, tar.gz, deb and many more, to check their contents for viruses." msgstr "" "Als scannen van archieven is aangezet zal de achtergronddienst archieven " -"zoals bz2, tar.gz, deb en vele anderen uitpakken en hun inhoud controleren " +"zoals .bz2, .tar.gz, .deb en vele andere uitpakken en hun inhoud controleren " "op virussen." #. Type: boolean #. Description #: ../clamav-base.templates:10001 -#, fuzzy -#| msgid "" -#| "For more information about what archives are supported see /usr/share/doc/" -#| "clamav-docs/clamdoc.pdf or the manpage clamscan(5)." msgid "" "For more information about what archives are supported, see /usr/share/doc/" "clamav-docs/clamdoc.pdf or the manpage clamscan(5)." msgstr "" "Voor meer informatie over welke archieven worden ondersteund zie /usr/share/" -"doc/clamav-docs/clamdoc.pdf of de man-pagina clamscan(5)." +"doc/clamav-docs/clamdoc.pdf of de man-pagina van clamscan(5)." #. Type: boolean #. Description @@ -461,19 +392,15 @@ #. Type: boolean #. Description #: ../clamav-base.templates:11001 -#, fuzzy -#| msgid "" -#| "This enables the builtin RAR archiver. Use with caution, as the RAR code " -#| "may have memory leaks. Clamscan can also use external RAR programs, such " -#| "as unrar, although clamd does not." msgid "" "This enables the builtin RAR archiver. Use with caution, as the RAR code may " "have memory leaks. Clamscan can also use external RAR programs, such as " "unrar, although clamd does not." msgstr "" -"Dit zet de ingebouwde RAR-archiveerder aan. Gebruik dit voorzichtig, de RAR-" -"code kan geheugenlekken bevatten. Clamscan kan ook externe RAR programma's " -"zoals unrar gebruiken, maar clamd doet dit niet." +"Met deze optie kunt u de ingebouwde RAR-archiveerder aanzetten. U wordt hier " +"echter gewaarschuwd, omdat de RAR-code geheugenlekken kan bevatten. Clamscan " +"kan ook externe RAR programma's zoals unrar gebruiken, maar clamd kan dit " +"niet." #. Type: string #. Description @@ -484,14 +411,10 @@ #. Type: string #. Description #: ../clamav-base.templates:12001 -#, fuzzy -#| msgid "" -#| "If you want you can set a limit on the stream length that can be scanned. " -#| "The value 0 disables this limit." msgid "You can set a limit on the stream length that can be scanned." msgstr "" "Als u wilt, kunt u een limiet zetten op de lengte van een te scannen " -"datastroom. De waarde 0 betekent ongelimiteerd." +"datastroom." #. Type: string #. Description @@ -506,8 +429,6 @@ #: ../clamav-base.templates:12001 ../clamav-base.templates:13001 #: ../clamav-base.templates:14001 ../clamav-base.templates:16001 #: ../clamav-base.templates:17001 -#, fuzzy -#| msgid "The value 0 disables the size limit." msgid "Entering '0' will disable this limit." msgstr "De waarde 0 betekent ongelimiteerd." @@ -520,16 +441,12 @@ #. Type: string #. Description #: ../clamav-base.templates:13001 -#, fuzzy -#| msgid "" -#| "This setting places a limit on recursion within archives, for example, a " -#| "tar file that is also gzipped. The value 0 disables the recursion limit." msgid "" "This setting places a limit on recursion within archives, for example, a tar " "file that is also gzipped." msgstr "" "Deze instelling zet een limiet op recursie in archieven, bijvoorbeeld een " -"tar-bestand dat ook ge-gzipped is. De waarde 0 betekent ongelimiteerd." +"tar-bestand dat ook ge-gzipped is." #. Type: string #. Description @@ -540,22 +457,15 @@ #. Type: string #. Description #: ../clamav-base.templates:14001 -#, fuzzy -#| msgid "" -#| "This setting places a limit on compression within archives, to guard " -#| "against archive bombs (small files that expand to massive ones, a form of " -#| "Denial of Service Attack). However, this limit may be too low for some " -#| "settings. The value 0 disables this limit." msgid "" "This setting places a limit on compression within archives, to guard against " "archive bombs (small files that expand to massive ones, a form of Denial of " "Service attack). However, this limit may be too low for some settings." msgstr "" -"Deze instelling zet een limiet op compressie in archieven, om te beschermen " -"tegen archiefbommen (kleine bestanden die decomprimeren tot reusachtige " -"bestanden, een vorm van dienstblokkeringsaanval (denial of service)). Deze " -"limiet is echter mogelijk te laag voor sommige instellingen. De waarde 0 " -"betekent ongelimiteerd." +"Deze instelling zet een limiet op compressieratio in archieven, om u te " +"beschermen tegen archiefbommen (kleine bestanden die decomprimeren tot " +"reusachtige bestanden; een vorm van dienstblokkeringsaanval (denial-of-" +"service)). Deze limiet is echter mogelijk te laag voor sommige instellingen." #. Type: string #. Description @@ -578,14 +488,12 @@ #. Type: string #. Description #: ../clamav-base.templates:17001 -#, fuzzy -#| msgid "Do you want the daemon to follow directory symlinks?" msgid "" "This value must be set if you want to allow the daemon to follow directory " "symlinks." msgstr "" -"Wilt u de achtergronddienst toestaan symbolische koppelingen naar mappen te " -"volgen?" +"Indien u wilt dat de achtergronddienst symbolische koppelingen naar mappen " +"kan volgen, dient u hier een waarde op te geven." #. Type: boolean #. Description @@ -607,13 +515,11 @@ #. Description #: ../clamav-base.templates:20001 msgid "Timeout for stopping the thread-scanner (seconds):" -msgstr "Timeout voor het stoppen van de procesdraden-scanner (seconden):" +msgstr "Timeout voor het stoppen van de thread-scanner (seconden):" #. Type: string #. Description #: ../clamav-base.templates:20001 -#, fuzzy -#| msgid "The value 0 disables the timeout." msgid "Entering '0' will disable the timeout." msgstr "De waarde 0 schakelt de tijdlimiet uit." @@ -621,13 +527,13 @@ #. Description #: ../clamav-base.templates:21001 msgid "Number of threads for the daemon:" -msgstr "Aantal procesdraden voor de achtergronddienst:" +msgstr "Aantal threads voor de achtergronddienst:" #. Type: string #. Description #: ../clamav-base.templates:22001 msgid "Number of pending connections allowed:" -msgstr "Aantal hangende verbindingen dat is toegestaan:" +msgstr "Aantal verbindingen in behandeling dat is toegestaan:" #. Type: boolean #. Description @@ -638,23 +544,19 @@ #. Type: boolean #. Description #: ../clamav-base.templates:23001 -#, fuzzy -#| msgid "" -#| "It is possible to log daemon activity to the system logger. This can be " -#| "done independently of whether you want to log activity to a special file." msgid "" "It is possible to log the daemon activity to the system logger. This can be " "done independently of whether you want to log activity to a special file." msgstr "" "Het is mogelijk om de activiteit van de achtergronddienst te loggen met het " -"systeemlogproces. Dit kan onafhankelijk gedaan worden van de keuze om de " +"systeemlogproces. Deze keuze is onafhankelijk van de keuze om de " "activiteiten van clamav-daemon in een speciaal bestand te loggen." #. Type: string #. Description #: ../clamav-base.templates:24001 msgid "Log file for clamav-daemon (enter none to disable):" -msgstr "Logbestand voor clamav-daemon (laat leeg voor geen):" +msgstr "Logbestand voor clamav-daemon (vul \"none\" in om dit uit te zetten):" #. Type: boolean #. Description @@ -671,26 +573,19 @@ #. Type: string #. Description #: ../clamav-base.templates:26001 -#, fuzzy -#| msgid "" -#| "During the SelfCheck the daemon checks if it needs to reload the virus " -#| "database. It also tries to repair problems caused by bugs in the daemon, " -#| "i.e in some cases it's able to repair broken data structures." msgid "" "During the SelfCheck the daemon checks if it needs to reload the virus " "database. It also tries to repair problems caused by bugs in the daemon, " "(that is, in some cases it's able to repair broken data structures)." msgstr "" "Tijdens de zelfcontrole controleert de achtergronddienst of het nodig is om " -"de virusgegevensbank te herladen. Het probeert ook problemen te repareren " -"die zijn ontstaan door programmeerfouten in de achtergronddienst, in sommige " +"de virusdatabase te herladen. Het probeert ook problemen te repareren die " +"zijn ontstaan door programmeerfouten in de achtergronddienst. In sommige " "gevallen is het bijvoorbeeld mogelijk gebroken datastructuren te repareren." #. Type: string #. Description #: ../clamav-base.templates:27001 -#, fuzzy -#| msgid "What user do you want to run clamav-daemon as:" msgid "User to run clamav-daemon as:" msgstr "Gebruiker waaronder clamav-daemon draait:" @@ -699,8 +594,8 @@ #: ../clamav-base.templates:27001 #, fuzzy #| msgid "" -#| "It is recommended to run the ClamAV programs as a non-priviledged user. " -#| "This will work with most MTA's with a little tweaking, but if you want to " +#| "It is recommended to run the 'clamav' programs as a non-privileged user. " +#| "This will work with most MTAs with a little tweaking, but if you want to " #| "use clamd for filesystem scans, running as root is probably unavoidable. " #| "Please see README.Debian in the clamav-base package for details." msgid "" @@ -709,130 +604,36 @@ "clamd for filesystem scans, running as root is probably unavoidable. Please " "see README.Debian in the clamav-base package for details." msgstr "" -"Het wordt aangeraden om de ClamAV programma's te draaien als een gebruiker " -"zonder rechten. Dit werkt, na soms kleine aanpassingen, met de meeste MTA's. " -"Als u clamd wilt gebruiken voor bestandssysteem-scans, is draaien als root " -"waarschijnlijk onontkoombaar. Zie README.Debian in het clamav-base pakket " -"voor de details." +"Het wordt aangeraden om de clamav programma's te draaien als een gebruiker " +"zonder rechten. Dit werkt, na soms kleine aanpassingen, met de meeste mail " +"transfer agents (MTA's). Als u clamd wilt gebruiken voor het scannen van " +"bestandssystemen, is het draaien met systeembeheerdersrechten waarschijnlijk " +"onontkoombaar. Om de details te bekijken kunt u het README.Debian bestand in " +"het clamav-base pakket raadplegen." #. Type: string #. Description #: ../clamav-base.templates:28001 -#, fuzzy -#| msgid "Groups for clamav-daemon (space-seperated):" msgid "Groups for clamav-daemon (space-separated):" -msgstr "Groepen voor clamav-daemon (spatie-gescheiden):" +msgstr "Groepen voor clamav-daemon (gescheiden door spaties):" #. Type: string #. Description #: ../clamav-base.templates:28001 msgid "Please enter any extra groups for clamd." -msgstr "Geef extra groepen voor clamd." +msgstr "Wilt u clamd toevoegen aan extra groepen?" #. Type: string #. Description #: ../clamav-base.templates:28001 -#, fuzzy -#| msgid "" -#| "Clamd runs as a non-priviledged user by default. If you need clamd to be " -#| "able to access files owned by another user (e.g., in combination with an " -#| "MTA), then you will need to add clamd to the group for that piece of " -#| "software. Please see README.Debian in the clamav-base package for " -#| "details." msgid "" "By default, clamd runs as a non-privileged user. If you need clamd to be " "able to access files owned by another user (e.g., in combination with an " "MTA), then you will need to add clamd to the group for that piece of " "software. Please see README.Debian in the clamav-base package for details." msgstr "" -"Clamd draait standaard als een gebruiker zonder privileges. Als clamd " -"toegang nodig heeft tot bestanden van andere gebruikers (bijv. in combinatie " -"met een MTA), dan dient u clamd toe te voegen aan de groep voor " -"desbetreffende programma. Zie README.Debian in het clamav-base pakket voor " -"details." - -#~ msgid "The use of mirrors.txt is no longer supported" -#~ msgstr "mirrors.txt wordt niet meer ondersteund" - -#~ msgid "" -#~ "During the transition to handling its mirror database through DNS, the " -#~ "clamav team dropped support for the 'mirrors.txt' config file." -#~ msgstr "" -#~ "Tijdens de overgang naar het afhandelen van de mirror-gevensbank via DNS, " -#~ "heeft het clamav-team ondersteuning voor het configuratiebestand 'mirrors." -#~ "txt' gestaakt." - -#~ msgid "" -#~ "If you have entered additional mirrors there, your file will be backed up " -#~ "as /var/lib/clamav/mirrors.txt.BACKUP." -#~ msgstr "" -#~ "Als u extra mirrors heeft ingevoerd zal er een reservekopie (/var/lib/" -#~ "clamav/mirrors.txt.BACKUP) van uw bestand gemaakt worden." - -#~ msgid "" -#~ "If your file was modified, your old mirrors (which may be way too many) " -#~ "will be added to the new /etc/clamav/freshclam.conf configuration file, " -#~ "using the DatabaseMirror keyword. Please examine freshclam.conf carefully " -#~ "after the update is through." -#~ msgstr "" -#~ "Al uw oude mirrors (wat er veel te veel kunnen zijn) zullen, met het " -#~ "sleutelwoord DatabaseMirror, toegevoegd worden aan het nieuwe " -#~ "configuratiebestand /etc/clamav/freshclam.conf. Bekijk dit bestand " -#~ "nauwkeurig nadat clamav is bijgewerkt." - -#~ msgid "daemon, ifup.d, cron, manual" -#~ msgstr "achtergronddienst, ifup.d, cron, handmatig" - -#~ msgid "" -#~ "If you don't know what network interface you use to connect to the " -#~ "internet leave this field blank and the daemon will be started from the " -#~ "init scripts instead." -#~ msgstr "" -#~ "Als u niet weet welke netwerkinterface u gebruikt om verbinding te maken " -#~ "met het internet, laat dan dit veld leeg. De achtergronddienst zal dan " -#~ "vanaf de init-scripts gestart worden." - -#~ msgid "" -#~ "If you do leave it blank make sure the computer is connected to the " -#~ "internet at all times or your logs will be really hard to interpret." -#~ msgstr "" -#~ "Als u dit veld leeg laat, dient u er voor te zorgen dat de computer " -#~ "altijd een verbinding heeft met internet, anders zullen uw logbestanden " -#~ "zeer moeilijk te interpreteren zijn." - -#~ msgid "Example: eth0" -#~ msgstr "Voorbeeld: eth0" - -#~ msgid "Clamav sockets and pids now in /var/run/clamav" -#~ msgstr "Clamav sockets en pids bevinden zich nu in /var/run/clamav" - -#~ msgid "" -#~ "ClamAV now runs as the non-priviledged user clamav by default. If your " -#~ "previous configuration relied on a socket or pid in /var/run, clam will " -#~ "not start after this upgrade. Please run dpkg-reconfigure clamav-base, " -#~ "and when asked about the socket, please change its location to /var/run/" -#~ "clamav/, and update the configuration of any software that uses this " -#~ "socket (e.g., exim, amavis)." -#~ msgstr "" -#~ "ClamAV draait vanaf nu standaard als de clamav-gebruiker, een gebruiker " -#~ "met maar weinig privileges. Als uw instellingen voorheen vertrouwden op " -#~ "de aanwezigheid van een socket of pid in /var/run dan zal clam niet " -#~ "starten na deze bijwerking. Voer dpkg-reconfigure clamav-base uit en " -#~ "verander, wanneer gevraagd naar de socket, de locatie naar /var/run/" -#~ "clamav/. Werk ook de instellingen bij van software die dit socket " -#~ "gebruiken (bijv. exim, amavis)." - -#~ msgid "A numeric value is mandatory" -#~ msgstr "Een numerieke waarde is vereist" - -#~ msgid "A non numerical answer to this question cannot be understood." -#~ msgstr "Het antwoord op deze vraag moet een getal zijn." - -#~ msgid "" -#~ "You need to answer this question if you want to allow the daemon to " -#~ "follow directory symlinks. The value 0 disables maximal directory depth " -#~ "limit." -#~ msgstr "" -#~ "U dient deze vraag te beantwoorden als u de achtergronddienst wilt " -#~ "toestaan symbolische koppelingen naar mappen te volgen. De waarde 0 zet " -#~ "de maximale mapdiepte-limiet uit." +"Clamd draait standaard als een gebruiker zonder rechten. Als clamd toegang " +"nodig heeft tot bestanden van andere gebruikers (bijv. in combinatie met een " +"MTA), dan dient u clamd toe te voegen aan de groep van het desbetreffende " +"programma. Voor details kunt u het README.Debian bestand in het clamav-base " +"pakket raadplegen." diff -Nru clamav-0.94.dfsg.1~rc1/debian/rules clamav-0.94.dfsg.1/debian/rules --- clamav-0.94.dfsg.1~rc1/debian/rules 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/rules 2008-11-12 15:24:52.000000000 -0500 @@ -41,7 +41,7 @@ fi;\ done; # Add here commands to configure the package. - ./configure --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-clamav --with-dbdir=/var/lib/clamav/ --sysconfdir=/etc/clamav --with-sendmail=/usr/sbin/sendmail --enable-milter --disable-clamuko --with-tcpwrappers --with-gnu-ld --with-dns --enable-dns-fix ${DEBUG_OPTS} --disable-unrar + ./configure --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-clamav --with-dbdir=/var/lib/clamav/ --sysconfdir=/etc/clamav --with-sendmail=/usr/sbin/sendmail --enable-milter --disable-clamuko --with-tcpwrappers --with-gnu-ld --with-dns --enable-dns-fix ${DEBUG_OPTS} --disable-unrar --libdir=\$${prefix}/lib build: build-stamp build-stamp: build-arch build-indep @@ -108,7 +108,6 @@ dh_install -X.svn -p$@ chmod +x debian/$@/usr/share/bug/$@/script dh_installchangelogs -p$@ ChangeLog - cp debian/clamav-base.overrides debian/clamav-base/usr/share/lintian/overrides/clamav-base dh_installdebconf -p$@ dh_installman -p$@ dh_installexamples -p$@ @@ -164,6 +163,7 @@ dh_installdocs -p$@ dh_installchangelogs -p$@ ChangeLog dh_compress -p$@ + dh_md5sums -p$@ dh_shlibdeps -l debian/libclamav5/usr/lib -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ @@ -182,7 +182,6 @@ dh_link -p$@ ${STRIP_OPTS} dh_compress -p$@ - cp debian/clamav.overrides debian/clamav/usr/share/lintian/overrides/clamav dh_md5sums -p$@ dh_installdeb -p$@ dh_shlibdeps -l debian/libclamav5/usr/lib -p$@ @@ -199,7 +198,6 @@ dh_installexamples -p$@ dh_install -X.svn -p$@ chmod +x debian/$@/usr/share/bug/$@/script - cp debian/clamav-freshclam.overrides debian/clamav-freshclam/usr/share/lintian/overrides/clamav-freshclam dh_installlogcheck -p$@ dh_installinit -p$@ --noscripts dh_installman -p$@ @@ -225,7 +223,6 @@ dh_installdirs -p$@ dh_install -X.svn -p$@ chmod +x debian/$@/usr/share/bug/$@/script - cp debian/clamav-daemon.overrides debian/clamav-daemon/usr/share/lintian/overrides/clamav-daemon dh_installlogcheck -p$@ dh_installinit -p$@ dh_installman -p$@ @@ -249,7 +246,6 @@ dh_installdocs -p$@ dh_install -X.svn -p$@ chmod +x debian/$@/usr/share/bug/$@/script - cp debian/clamav-milter.overrides debian/clamav-milter/usr/share/lintian/overrides/clamav-milter dh_installinit -p$@ dh_installman -p$@ dh_installdocs -p$@ @@ -290,7 +286,6 @@ dh_installdocs -p$@ dh_installchangelogs -p$@ ChangeLog dh_install -X.svn -p$@ - cp debian/libclamav-dev.overrides debian/libclamav-dev/usr/share/lintian/overrides/libclamav-dev dh_link -p$@ ${STRIP_OPTS} dh_compress -p$@ diff -Nru clamav-0.94.dfsg.1~rc1/debian/usr.sbin.clamd clamav-0.94.dfsg.1/debian/usr.sbin.clamd --- clamav-0.94.dfsg.1~rc1/debian/usr.sbin.clamd 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/usr.sbin.clamd 2008-11-12 15:24:52.000000000 -0500 @@ -6,6 +6,7 @@ /usr/sbin/clamd { #include + #include /etc/clamav/clamd.conf r, diff -Nru clamav-0.94.dfsg.1~rc1/debian/watch clamav-0.94.dfsg.1/debian/watch --- clamav-0.94.dfsg.1~rc1/debian/watch 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/debian/watch 2008-11-12 15:24:52.000000000 -0500 @@ -1,4 +1,4 @@ version=3 -opts=uversionmangle=s/(\d+)(rc)/$1\.0\.$2/ \ +opts=uversionmangle=s/(\d+)(rc)/$1\.0\.$2/,dversionmangle=s/\.dfsg// \ http://sf.net/clamav/clamav-(.*).tar.gz debian uupdate Binary files /tmp/50HOQhS7DZ/clamav-0.94.dfsg.1~rc1/docs/clamdoc.pdf and /tmp/vTsPRd07xF/clamav-0.94.dfsg.1/docs/clamdoc.pdf differ diff -Nru clamav-0.94.dfsg.1~rc1/docs/clamdoc.tex clamav-0.94.dfsg.1/docs/clamdoc.tex --- clamav-0.94.dfsg.1~rc1/docs/clamdoc.tex 2008-10-15 05:50:20.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/clamdoc.tex 2008-10-30 10:19:27.000000000 -0400 @@ -71,7 +71,7 @@ \vspace{3cm} \begin{flushright} \rule[-1ex]{8cm}{3pt}\\ - \huge Clam AntiVirus 0.94.1rc1\\ + \huge Clam AntiVirus 0.94.1\\ \huge \emph{User Manual}\\ \end{flushright} @@ -127,7 +127,7 @@ \item{POSIX compliant, portable} \item{Fast scanning} \item{Supports on-access scanning (Linux and FreeBSD only)} - \item{Detects over 400.000 viruses, worms and trojans, including + \item{Detects over 450.000 viruses, worms and trojans, including Microsoft Office macro viruses, mobile malware, and other threats} \item{Scans within archives and compressed files (also protects against archive bombs), built-in support includes: diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/clamdoc.html clamav-0.94.dfsg.1/docs/html/clamdoc.html --- clamav-0.94.dfsg.1~rc1/docs/html/clamdoc.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/clamdoc.html 2008-10-30 10:20:14.000000000 -0400 @@ -44,7 +44,7 @@

\includegraphics[width=353pt]{clam.eps}
@@ -56,7 +56,7 @@

-
Clam AntiVirus 0.94.1rc1 +
Clam AntiVirus 0.94.1
User Manual
@@ -215,7 +215,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/index.html clamav-0.94.dfsg.1/docs/html/index.html --- clamav-0.94.dfsg.1~rc1/docs/html/index.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/index.html 2008-10-30 10:20:14.000000000 -0400 @@ -44,7 +44,7 @@

\includegraphics[width=353pt]{clam.eps}
@@ -56,7 +56,7 @@

-
Clam AntiVirus 0.94.1rc1 +
Clam AntiVirus 0.94.1
User Manual
@@ -215,7 +215,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node10.html clamav-0.94.dfsg.1/docs/html/node10.html --- clamav-0.94.dfsg.1~rc1/docs/html/node10.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node10.html 2008-10-30 10:20:14.000000000 -0400 @@ -123,7 +123,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node11.html clamav-0.94.dfsg.1/docs/html/node11.html --- clamav-0.94.dfsg.1~rc1/docs/html/node11.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node11.html 2008-10-30 10:20:14.000000000 -0400 @@ -75,7 +75,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node12.html clamav-0.94.dfsg.1/docs/html/node12.html --- clamav-0.94.dfsg.1~rc1/docs/html/node12.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node12.html 2008-10-30 10:20:14.000000000 -0400 @@ -69,7 +69,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node13.html clamav-0.94.dfsg.1/docs/html/node13.html --- clamav-0.94.dfsg.1~rc1/docs/html/node13.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node13.html 2008-10-30 10:20:14.000000000 -0400 @@ -75,7 +75,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node14.html clamav-0.94.dfsg.1/docs/html/node14.html --- clamav-0.94.dfsg.1~rc1/docs/html/node14.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node14.html 2008-10-30 10:20:14.000000000 -0400 @@ -65,7 +65,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node15.html clamav-0.94.dfsg.1/docs/html/node15.html --- clamav-0.94.dfsg.1~rc1/docs/html/node15.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node15.html 2008-10-30 10:20:14.000000000 -0400 @@ -142,7 +142,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node16.html clamav-0.94.dfsg.1/docs/html/node16.html --- clamav-0.94.dfsg.1~rc1/docs/html/node16.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node16.html 2008-10-30 10:20:14.000000000 -0400 @@ -96,7 +96,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node17.html clamav-0.94.dfsg.1/docs/html/node17.html --- clamav-0.94.dfsg.1~rc1/docs/html/node17.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node17.html 2008-10-30 10:20:14.000000000 -0400 @@ -83,7 +83,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node18.html clamav-0.94.dfsg.1/docs/html/node18.html --- clamav-0.94.dfsg.1~rc1/docs/html/node18.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node18.html 2008-10-30 10:20:14.000000000 -0400 @@ -79,7 +79,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node19.html clamav-0.94.dfsg.1/docs/html/node19.html --- clamav-0.94.dfsg.1~rc1/docs/html/node19.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node19.html 2008-10-30 10:20:14.000000000 -0400 @@ -90,7 +90,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node1.html clamav-0.94.dfsg.1/docs/html/node1.html --- clamav-0.94.dfsg.1~rc1/docs/html/node1.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node1.html 2008-10-30 10:20:14.000000000 -0400 @@ -182,7 +182,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node20.html clamav-0.94.dfsg.1/docs/html/node20.html --- clamav-0.94.dfsg.1~rc1/docs/html/node20.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node20.html 2008-10-30 10:20:14.000000000 -0400 @@ -81,7 +81,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node21.html clamav-0.94.dfsg.1/docs/html/node21.html --- clamav-0.94.dfsg.1~rc1/docs/html/node21.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node21.html 2008-10-30 10:20:14.000000000 -0400 @@ -75,7 +75,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node22.html clamav-0.94.dfsg.1/docs/html/node22.html --- clamav-0.94.dfsg.1~rc1/docs/html/node22.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node22.html 2008-10-30 10:20:14.000000000 -0400 @@ -139,7 +139,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node23.html clamav-0.94.dfsg.1/docs/html/node23.html --- clamav-0.94.dfsg.1~rc1/docs/html/node23.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node23.html 2008-10-30 10:20:14.000000000 -0400 @@ -77,7 +77,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node24.html clamav-0.94.dfsg.1/docs/html/node24.html --- clamav-0.94.dfsg.1~rc1/docs/html/node24.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node24.html 2008-10-30 10:20:14.000000000 -0400 @@ -80,7 +80,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node25.html clamav-0.94.dfsg.1/docs/html/node25.html --- clamav-0.94.dfsg.1~rc1/docs/html/node25.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node25.html 2008-10-30 10:20:14.000000000 -0400 @@ -164,7 +164,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node26.html clamav-0.94.dfsg.1/docs/html/node26.html --- clamav-0.94.dfsg.1~rc1/docs/html/node26.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node26.html 2008-10-30 10:20:14.000000000 -0400 @@ -76,7 +76,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node27.html clamav-0.94.dfsg.1/docs/html/node27.html --- clamav-0.94.dfsg.1~rc1/docs/html/node27.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node27.html 2008-10-30 10:20:14.000000000 -0400 @@ -92,7 +92,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node28.html clamav-0.94.dfsg.1/docs/html/node28.html --- clamav-0.94.dfsg.1~rc1/docs/html/node28.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node28.html 2008-10-30 10:20:14.000000000 -0400 @@ -70,7 +70,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node29.html clamav-0.94.dfsg.1/docs/html/node29.html --- clamav-0.94.dfsg.1~rc1/docs/html/node29.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node29.html 2008-10-30 10:20:14.000000000 -0400 @@ -94,7 +94,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node2.html clamav-0.94.dfsg.1/docs/html/node2.html --- clamav-0.94.dfsg.1~rc1/docs/html/node2.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node2.html 2008-10-30 10:20:14.000000000 -0400 @@ -79,7 +79,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node30.html clamav-0.94.dfsg.1/docs/html/node30.html --- clamav-0.94.dfsg.1~rc1/docs/html/node30.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node30.html 2008-10-30 10:20:14.000000000 -0400 @@ -83,7 +83,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node31.html clamav-0.94.dfsg.1/docs/html/node31.html --- clamav-0.94.dfsg.1~rc1/docs/html/node31.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node31.html 2008-10-30 10:20:14.000000000 -0400 @@ -126,7 +126,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node32.html clamav-0.94.dfsg.1/docs/html/node32.html --- clamav-0.94.dfsg.1~rc1/docs/html/node32.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node32.html 2008-10-30 10:20:14.000000000 -0400 @@ -65,7 +65,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node33.html clamav-0.94.dfsg.1/docs/html/node33.html --- clamav-0.94.dfsg.1~rc1/docs/html/node33.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node33.html 2008-10-30 10:20:14.000000000 -0400 @@ -77,7 +77,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node34.html clamav-0.94.dfsg.1/docs/html/node34.html --- clamav-0.94.dfsg.1~rc1/docs/html/node34.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node34.html 2008-10-30 10:20:14.000000000 -0400 @@ -87,7 +87,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node35.html clamav-0.94.dfsg.1/docs/html/node35.html --- clamav-0.94.dfsg.1~rc1/docs/html/node35.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node35.html 2008-10-30 10:20:14.000000000 -0400 @@ -62,7 +62,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node36.html clamav-0.94.dfsg.1/docs/html/node36.html --- clamav-0.94.dfsg.1~rc1/docs/html/node36.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node36.html 2008-10-30 10:20:14.000000000 -0400 @@ -90,7 +90,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node37.html clamav-0.94.dfsg.1/docs/html/node37.html --- clamav-0.94.dfsg.1~rc1/docs/html/node37.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node37.html 2008-10-30 10:20:15.000000000 -0400 @@ -73,7 +73,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node38.html clamav-0.94.dfsg.1/docs/html/node38.html --- clamav-0.94.dfsg.1~rc1/docs/html/node38.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node38.html 2008-10-30 10:20:15.000000000 -0400 @@ -75,7 +75,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node39.html clamav-0.94.dfsg.1/docs/html/node39.html --- clamav-0.94.dfsg.1~rc1/docs/html/node39.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node39.html 2008-10-30 10:20:15.000000000 -0400 @@ -75,7 +75,7 @@
Tomasz Kojm -2008-10-15 +2008-10-30
diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node3.html clamav-0.94.dfsg.1/docs/html/node3.html --- clamav-0.94.dfsg.1~rc1/docs/html/node3.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node3.html 2008-10-30 10:20:14.000000000 -0400 @@ -67,7 +67,7 @@
  • Supports on-access scanning (Linux and FreeBSD only)
    • -
  • Detects over 400.000 viruses, worms and trojans, including +
  • Detects over 450.000 viruses, worms and trojans, including Microsoft Office macro viruses, mobile malware, and other threats
  • Scans within archives and compressed files (also protects @@ -183,7 +183,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node40.html clamav-0.94.dfsg.1/docs/html/node40.html --- clamav-0.94.dfsg.1~rc1/docs/html/node40.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node40.html 2008-10-30 10:20:15.000000000 -0400 @@ -64,7 +64,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node41.html clamav-0.94.dfsg.1/docs/html/node41.html --- clamav-0.94.dfsg.1~rc1/docs/html/node41.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node41.html 2008-10-30 10:20:15.000000000 -0400 @@ -111,7 +111,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node42.html clamav-0.94.dfsg.1/docs/html/node42.html --- clamav-0.94.dfsg.1~rc1/docs/html/node42.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node42.html 2008-10-30 10:20:15.000000000 -0400 @@ -68,7 +68,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node43.html clamav-0.94.dfsg.1/docs/html/node43.html --- clamav-0.94.dfsg.1~rc1/docs/html/node43.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node43.html 2008-10-30 10:20:15.000000000 -0400 @@ -74,7 +74,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node44.html clamav-0.94.dfsg.1/docs/html/node44.html --- clamav-0.94.dfsg.1~rc1/docs/html/node44.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node44.html 2008-10-30 10:20:15.000000000 -0400 @@ -103,7 +103,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node45.html clamav-0.94.dfsg.1/docs/html/node45.html --- clamav-0.94.dfsg.1~rc1/docs/html/node45.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node45.html 2008-10-30 10:20:15.000000000 -0400 @@ -214,7 +214,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node46.html clamav-0.94.dfsg.1/docs/html/node46.html --- clamav-0.94.dfsg.1~rc1/docs/html/node46.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node46.html 2008-10-30 10:20:15.000000000 -0400 @@ -62,7 +62,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node47.html clamav-0.94.dfsg.1/docs/html/node47.html --- clamav-0.94.dfsg.1~rc1/docs/html/node47.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node47.html 2008-10-30 10:20:15.000000000 -0400 @@ -65,7 +65,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node48.html clamav-0.94.dfsg.1/docs/html/node48.html --- clamav-0.94.dfsg.1~rc1/docs/html/node48.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node48.html 2008-10-30 10:20:16.000000000 -0400 @@ -67,7 +67,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node49.html clamav-0.94.dfsg.1/docs/html/node49.html --- clamav-0.94.dfsg.1~rc1/docs/html/node49.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node49.html 2008-10-30 10:20:16.000000000 -0400 @@ -65,7 +65,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node4.html clamav-0.94.dfsg.1/docs/html/node4.html --- clamav-0.94.dfsg.1~rc1/docs/html/node4.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node4.html 2008-10-30 10:20:14.000000000 -0400 @@ -86,7 +86,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node50.html clamav-0.94.dfsg.1/docs/html/node50.html --- clamav-0.94.dfsg.1~rc1/docs/html/node50.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node50.html 2008-10-30 10:20:16.000000000 -0400 @@ -82,7 +82,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node51.html clamav-0.94.dfsg.1/docs/html/node51.html --- clamav-0.94.dfsg.1~rc1/docs/html/node51.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node51.html 2008-10-30 10:20:16.000000000 -0400 @@ -613,7 +613,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node52.html clamav-0.94.dfsg.1/docs/html/node52.html --- clamav-0.94.dfsg.1~rc1/docs/html/node52.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node52.html 2008-10-30 10:20:16.000000000 -0400 @@ -459,7 +459,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node53.html clamav-0.94.dfsg.1/docs/html/node53.html --- clamav-0.94.dfsg.1~rc1/docs/html/node53.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node53.html 2008-10-30 10:20:16.000000000 -0400 @@ -63,7 +63,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node54.html clamav-0.94.dfsg.1/docs/html/node54.html --- clamav-0.94.dfsg.1~rc1/docs/html/node54.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node54.html 2008-10-30 10:20:16.000000000 -0400 @@ -62,7 +62,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node55.html clamav-0.94.dfsg.1/docs/html/node55.html --- clamav-0.94.dfsg.1~rc1/docs/html/node55.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node55.html 2008-10-30 10:20:16.000000000 -0400 @@ -134,7 +134,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node56.html clamav-0.94.dfsg.1/docs/html/node56.html --- clamav-0.94.dfsg.1~rc1/docs/html/node56.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node56.html 2008-10-30 10:20:16.000000000 -0400 @@ -64,11 +64,11 @@ The command line arguments were:
    latex2html -local_icons clamdoc.tex

    -The translation was initiated by Tomasz Kojm on 2008-10-15 +The translation was initiated by Tomasz Kojm on 2008-10-30

    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node5.html clamav-0.94.dfsg.1/docs/html/node5.html --- clamav-0.94.dfsg.1~rc1/docs/html/node5.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node5.html 2008-10-30 10:20:14.000000000 -0400 @@ -65,7 +65,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node6.html clamav-0.94.dfsg.1/docs/html/node6.html --- clamav-0.94.dfsg.1~rc1/docs/html/node6.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node6.html 2008-10-30 10:20:14.000000000 -0400 @@ -71,7 +71,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node7.html clamav-0.94.dfsg.1/docs/html/node7.html --- clamav-0.94.dfsg.1~rc1/docs/html/node7.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node7.html 2008-10-30 10:20:14.000000000 -0400 @@ -80,7 +80,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node8.html clamav-0.94.dfsg.1/docs/html/node8.html --- clamav-0.94.dfsg.1~rc1/docs/html/node8.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node8.html 2008-10-30 10:20:14.000000000 -0400 @@ -61,7 +61,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/html/node9.html clamav-0.94.dfsg.1/docs/html/node9.html --- clamav-0.94.dfsg.1~rc1/docs/html/node9.html 2008-10-15 05:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/html/node9.html 2008-10-30 10:20:14.000000000 -0400 @@ -81,7 +81,7 @@
    Tomasz Kojm -2008-10-15 +2008-10-30
    diff -Nru clamav-0.94.dfsg.1~rc1/docs/man/freshclam.1.in clamav-0.94.dfsg.1/docs/man/freshclam.1.in --- clamav-0.94.dfsg.1~rc1/docs/man/freshclam.1.in 2008-10-15 06:26:59.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/man/freshclam.1.in 2008-10-28 05:38:06.000000000 -0400 @@ -67,6 +67,9 @@ .TP \fB\-\-list\-mirrors\fR Print mirror details from mirrors.dat (cache file for the mirror manager). +.TP +\fB\-\-submit\-stats[=/path/to/clamd.conf]\fR +Upload detection statistics to the ClamAV Project (see freshclam.conf(5):SubmitDetectionStats for more details). No database update will be performed. This option only works in the interactive mode. .SH "EXAMPLES" .LP .TP diff -Nru clamav-0.94.dfsg.1~rc1/docs/man/freshclam.conf.5.in clamav-0.94.dfsg.1/docs/man/freshclam.conf.5.in --- clamav-0.94.dfsg.1~rc1/docs/man/freshclam.conf.5.in 2008-10-11 15:58:42.000000000 -0400 +++ clamav-0.94.dfsg.1/docs/man/freshclam.conf.5.in 2008-10-28 15:21:03.000000000 -0400 @@ -148,6 +148,11 @@ When enabled freshclam will submit statistics to the ClamAV Project about the latest virus detections in your environment. The ClamAV maintainers will then use this data to determine what types of malware are the most detected in the field and in what geographic area they are. This feature requires LogTime and LogFile to be enabled in clamd.conf. The path for clamd.conf file must be provided. .br Default: disabled +.TP +\fBDetectionStatsCountry STRING\fR +Country of origin of malware/detection statistics (for statistical purposes only). The statistics collector at ClamAV.net will look up your IP address to determine the geographical origin of the malware reported by your installation. If this installation is mainly used to scan data which comes from a different location, please enable this option and enter a two-letter code (see http://www.iana.org/domains/root/db/) of the country of origin. +.br +Default: disabled .SH "FILES" .LP @CFGDIR@/freshclam.conf diff -Nru clamav-0.94.dfsg.1~rc1/etc/freshclam.conf clamav-0.94.dfsg.1/etc/freshclam.conf --- clamav-0.94.dfsg.1~rc1/etc/freshclam.conf 2008-11-12 15:24:39.000000000 -0500 +++ clamav-0.94.dfsg.1/etc/freshclam.conf 2008-11-12 15:24:52.000000000 -0500 @@ -149,3 +149,13 @@ # This feature requires LogTime and LogFile to be enabled in clamd.conf. # Default: no #SubmitDetectionStats /path/to/clamd.conf + +# Country of origin of malware/detection statistics (for statistical +# purposes only). The statistics collector at ClamAV.net will look up +# your IP address to determine the geographical origin of the malware +# reported by your installation. If this installation is mainly used to +# scan data which comes from a different location, please enable this +# option and enter a two-letter code (see http://www.iana.org/domains/root/db/) +# of the country of origin. +# Default: disabled +#DetectionStatsCountry country-code diff -Nru clamav-0.94.dfsg.1~rc1/freshclam/execute.c clamav-0.94.dfsg.1/freshclam/execute.c --- clamav-0.94.dfsg.1~rc1/freshclam/execute.c 2008-06-12 19:51:31.000000000 -0400 +++ clamav-0.94.dfsg.1/freshclam/execute.c 2008-10-27 09:53:20.000000000 -0400 @@ -52,10 +52,10 @@ logg("*%s: EXIT_%d\n", type, ret); exit(ret); } - if(system(text) == -1) { + if(system(text) == -1) logg("%s: system(%s) failed\n", type, text); - return; - } + + return; } #ifdef C_WINDOWS diff -Nru clamav-0.94.dfsg.1~rc1/freshclam/freshclam.c clamav-0.94.dfsg.1/freshclam/freshclam.c --- clamav-0.94.dfsg.1~rc1/freshclam/freshclam.c 2008-10-15 06:28:24.000000000 -0400 +++ clamav-0.94.dfsg.1/freshclam/freshclam.c 2008-10-28 05:50:56.000000000 -0400 @@ -144,6 +144,7 @@ mprintf(" --on-error-execute=COMMAND execute COMMAND if errors occured\n"); mprintf(" --on-outdated-execute=COMMAND execute COMMAND when software is outdated\n"); mprintf(" --list-mirrors print mirrors from mirrors.dat\n"); + mprintf(" --submit-stats[=/path/clamd.conf] only submit detection statistics\n"); mprintf("\n"); } @@ -233,7 +234,7 @@ {"on-error-execute", 1, 0, 0}, {"on-outdated-execute", 1, 0, 0}, {"list-mirrors", 0, 0, 0}, - /* {"submit-stats", 2, 0, 0}, */ + {"submit-stats", 2, 0, 0}, {0, 0, 0, 0} }; @@ -580,11 +581,12 @@ } } else { - /* if(opt_check(opt, "submit-stats")) { cfgfile = opt_arg(opt, "submit-stats"); if(!cfgfile) cfgfile = CONFDIR"/clamd.conf"; + if(!opt_check(opt, "no-warnings")) + logg(" *** Virus databases are not updated in this mode ***\n"); ret = submitstats(cfgfile, copt); } else { ret = download(copt, opt, newdir, cfgfile); @@ -592,12 +594,6 @@ if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled) submitstats(cpt->strarg, copt); } - */ - ret = download(copt, opt, newdir, cfgfile); - - if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled) - submitstats(cpt->strarg, copt); - } if(ret > 1) { diff -Nru clamav-0.94.dfsg.1~rc1/freshclam/manager.c clamav-0.94.dfsg.1/freshclam/manager.c --- clamav-0.94.dfsg.1~rc1/freshclam/manager.c 2008-10-15 04:46:44.000000000 -0400 +++ clamav-0.94.dfsg.1/freshclam/manager.c 2008-10-28 15:06:41.000000000 -0400 @@ -124,9 +124,11 @@ { int socketfd = -1; +#ifdef SUPPORT_IPv6 if(prot == AF_INET6) socketfd = socket(AF_INET6, SOCK_STREAM, 0); else +#endif socketfd = socket(AF_INET, SOCK_STREAM, 0); if(socketfd < 0) { logg("!Can't create new socket\n"); @@ -151,9 +153,11 @@ } else { void *addr; +#ifdef SUPPORT_IPv6 if(res->ai_family == AF_INET6) addr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr; else +#endif addr = &((struct sockaddr_in *) res->ai_addr)->sin_addr; if(inet_ntop(res->ai_family, addr, ipaddr, sizeof(ipaddr))) @@ -253,9 +257,11 @@ void *addr; ips++; +#ifdef SUPPORT_IPv6 if(rp->ai_family == AF_INET6) addr = &((struct sockaddr_in6 *) rp->ai_addr)->sin6_addr; else +#endif addr = &((struct sockaddr_in *) rp->ai_addr)->sin_addr; if(!inet_ntop(rp->ai_family, addr, ipaddr, sizeof(ipaddr))) { @@ -469,7 +475,7 @@ char buff[512], statsdat[512], newstatsdat[512], uastr[128]; char logfile[256], fbuff[FILEBUFF]; char *pt, *pt2; - const char *line; + const char *line, *country = NULL; struct cfgstruct *clamdopt; const struct cfgstruct *cpt; struct stat sb; @@ -478,6 +484,14 @@ unsigned int qcnt, entries, submitted = 0, permfail = 0; + if((cpt = cfgopt(copt, "DetectionStatsCountry"))->enabled) { + if(strlen(cpt->strarg) != 2 || !isalpha(cpt->strarg[0]) || !isalpha(cpt->strarg[1])) { + logg("!SubmitDetectionStats: DetectionStatsCountry requires a two-letter country code\n"); + return 56; + } + country = cpt->strarg; + } + if(!(clamdopt = getcfg(clamdcfg, 1))) { logg("!SubmitDetectionStats: Can't open or parse configuration file %s\n", clamdcfg); return 56; @@ -541,7 +555,7 @@ if((cpt = cfgopt(copt, "HTTPUserAgent"))->enabled) strncpy(uastr, cpt->strarg, sizeof(uastr)); else - snprintf(uastr, sizeof(uastr), PACKAGE"/%s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")", get_version()); + snprintf(uastr, sizeof(uastr), PACKAGE"/%s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")%s%s", get_version(), country ? ":" : "", country ? country : ""); uastr[sizeof(uastr) - 1] = 0; ret = 0; diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/dconf.c clamav-0.94.dfsg.1/libclamav/dconf.c --- clamav-0.94.dfsg.1~rc1/libclamav/dconf.c 2008-07-15 04:15:19.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/dconf.c 2008-10-24 05:37:26.000000000 -0400 @@ -101,6 +101,7 @@ { "OTHER", "JPEG", OTHER_CONF_JPEG, 1 }, { "OTHER", "CRYPTFF", OTHER_CONF_CRYPTFF, 1 }, { "OTHER", "DLP", OTHER_CONF_DLP, 1 }, + { "OTHER", "MYDOOMLOG", OTHER_CONF_MYDOOMLOG, 1 }, { "PHISHING", "ENGINE", PHISHING_CONF_ENGINE, 1 }, { "PHISHING", "ENTCONV", PHISHING_CONF_ENTCONV, 1 }, diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/dconf.h clamav-0.94.dfsg.1/libclamav/dconf.h --- clamav-0.94.dfsg.1~rc1/libclamav/dconf.h 2008-07-15 04:15:19.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/dconf.h 2008-10-24 05:37:53.000000000 -0400 @@ -92,6 +92,7 @@ #define OTHER_CONF_JPEG 0x8 #define OTHER_CONF_CRYPTFF 0x10 #define OTHER_CONF_DLP 0x20 +#define OTHER_CONF_MYDOOMLOG 0x40 /* Phishing flags */ #define PHISHING_CONF_ENGINE 0x1 diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/others.c clamav-0.94.dfsg.1/libclamav/others.c --- clamav-0.94.dfsg.1~rc1/libclamav/others.c 2008-10-15 06:14:46.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/others.c 2008-10-30 10:28:51.000000000 -0400 @@ -90,7 +90,7 @@ #define P_tmpdir "C:\\WINDOWS\\TEMP" #endif -#define CL_FLEVEL 36 /* don't touch it */ +#define CL_FLEVEL 37 /* don't touch it */ uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0; diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/readdb.c clamav-0.94.dfsg.1/libclamav/readdb.c --- clamav-0.94.dfsg.1~rc1/libclamav/readdb.c 2008-10-11 15:58:44.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/readdb.c 2008-10-30 11:43:26.000000000 -0400 @@ -1190,7 +1190,7 @@ { char buffer[FILEBUFF], *pt; unsigned int line = 0; - struct cli_ignsig *new, *last = NULL; + struct cli_ignsig *new; struct cli_ignored *ignored; int ret; @@ -1244,12 +1244,8 @@ break; } - if(!last) { - last = ignored->list = new; - } else { - last->next = new; - last = new; - } + new->next = ignored->list; + ignored->list = new; } if(ret) { diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/scanners.c clamav-0.94.dfsg.1/libclamav/scanners.c --- clamav-0.94.dfsg.1~rc1/libclamav/scanners.c 2008-10-11 15:58:44.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/scanners.c 2008-10-24 05:38:45.000000000 -0400 @@ -2044,7 +2044,8 @@ break; case CL_TYPE_BINARY_DATA: - ret = cli_check_mydoom_log(desc, ctx->virname); + if(SCAN_ALGO && (DCONF_OTHER & OTHER_CONF_MYDOOMLOG)) + ret = cli_check_mydoom_log(desc, ctx->virname); break; case CL_TYPE_TEXT_ASCII: diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/special.c clamav-0.94.dfsg.1/libclamav/special.c --- clamav-0.94.dfsg.1~rc1/libclamav/special.c 2008-05-16 18:14:58.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/special.c 2008-10-24 05:44:15.000000000 -0400 @@ -58,6 +58,8 @@ if (cli_readn(desc, &record, 32) != 32) { break; } + if(!j && record[0] == 0xffffffff) /* bb#1241 */ + return CL_CLEAN; /* Decode the key */ record[0] = ~ntohl(record[0]); diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/tnef.c clamav-0.94.dfsg.1/libclamav/tnef.c --- clamav-0.94.dfsg.1~rc1/libclamav/tnef.c 2008-08-21 07:20:04.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/tnef.c 2008-10-30 12:04:40.000000000 -0400 @@ -155,7 +155,7 @@ } fb = fileblobCreate(); if(tnef_message(fp, type, tag, length, fsize) != 0) { - cli_errmsg("Error reading TNEF message\n"); + cli_dbgmsg("TNEF: Error reading TNEF message\n"); ret = CL_EFORMAT; alldone = 1; } @@ -163,7 +163,7 @@ case LVL_ATTACHMENT: cli_dbgmsg("TNEF - found attachment\n"); if(tnef_attachment(fp, type, tag, length, dir, &fb, fsize) != 0) { - cli_errmsg("Error reading TNEF attachment\n"); + cli_dbgmsg("TNEF: Error reading TNEF attachment\n"); ret = CL_EFORMAT; alldone = 1; } @@ -287,7 +287,7 @@ /*cli_dbgmsg("%lu %lu\n", (long)(offset + length), ftell(fp));*/ if(!CLI_ISCONTAINED2(0, fsize, (off_t)offset, (off_t)length)) { - cli_errmsg("TNEF: Incorrect length field in tnef_message\n"); + cli_dbgmsg("TNEF: Incorrect length field in tnef_message\n"); return -1; } if(fseek(fp, offset + length, SEEK_SET) < 0) @@ -369,7 +369,7 @@ /*cli_dbgmsg("%lu %lu\n", (long)(offset + length), ftell(fp));*/ if(!CLI_ISCONTAINED2(0, fsize, (off_t)offset, (off_t)length)) { - cli_errmsg("TNEF: Incorrect length field in tnef_attachment\n"); + cli_dbgmsg("TNEF: Incorrect length field in tnef_attachment\n"); return -1; } if(fseek(fp, (long)(offset + length), SEEK_SET) < 0) /* shouldn't be needed */ diff -Nru clamav-0.94.dfsg.1~rc1/libclamav/vba_extract.c clamav-0.94.dfsg.1/libclamav/vba_extract.c --- clamav-0.94.dfsg.1~rc1/libclamav/vba_extract.c 2008-08-21 16:53:11.000000000 -0400 +++ clamav-0.94.dfsg.1/libclamav/vba_extract.c 2008-10-30 10:16:51.000000000 -0400 @@ -107,7 +107,7 @@ if((name == NULL) || (*name == '\0') || (size <= 0)) return NULL; - newname = (char *)cli_malloc(size * 7); + newname = (char *)cli_malloc(size * 7 + 1); if(newname == NULL) return NULL; diff -Nru clamav-0.94.dfsg.1~rc1/m4/acinclude.m4 clamav-0.94.dfsg.1/m4/acinclude.m4 --- clamav-0.94.dfsg.1~rc1/m4/acinclude.m4 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/m4/acinclude.m4 2008-10-30 10:16:50.000000000 -0400 @@ -683,7 +683,13 @@ BZ2_bzDecompressEnd(&bz); return 0; } -], [ac_cv_c_cve_2008_1372=ok], [ac_cv_c_cve_2008_1372=bugged], [ac_cv_c_cve_2008_1372=ok]) +], [ac_cv_c_cve_2008_1372=ok], [ +if test $? -gt 127; then + ac_cv_c_cve_2008_1372=bugged +else + ac_cv_c_cve_2008_1372=linkfailed +fi +], [ac_cv_c_cve_2008_1372=ok]) LIBS="$save_LIBS" ]) ]) @@ -741,3 +747,39 @@ undefine([NAME]) ]) +dnl Try to set a correct default libdir for multiarch systems +AC_DEFUN([AC_LIB_MULTILIB_GUESS], +[ + # Only modify libdir if user has not overriden it + default_libdir='${exec_prefix}/lib' + if test "$libdir" = "$default_libdir"; then + AC_MSG_CHECKING([for multiarch libdir]) + # Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html + if test "$GCC" = yes; then + ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` + else + ac_multilibdir=. + fi + case "$ac_multilibdir" in + # I don't know if the first two cases can happen, but it would be a + # bad idea to override $exec_prefix + /* | ../../* | .) acl_libdirstem=lib ;; + ../*) acl_libdirstem=`echo $ac_multilibdir | sed 's/^...//' ` ;; + *) acl_libdirstem=lib/$ac_multilibdir ;; + esac + libdir='${exec_prefix}/'$acl_libdirstem + AC_MSG_RESULT([$libdir]) + else + acl_libdirstem=lib + if test -d "$libdir"; then + case "$libdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$libdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac + esac + fi + fi +]) + diff -Nru clamav-0.94.dfsg.1~rc1/m4/lib-prefix.m4 clamav-0.94.dfsg.1/m4/lib-prefix.m4 --- clamav-0.94.dfsg.1~rc1/m4/lib-prefix.m4 2008-05-16 18:14:50.000000000 -0400 +++ clamav-0.94.dfsg.1/m4/lib-prefix.m4 2008-10-24 05:08:37.000000000 -0400 @@ -154,32 +154,8 @@ ]) dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl the basename of the libdir, for example: "lib", "lib32", or "lib64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi + AC_REQUIRE([AC_LIB_MULTILIB_GUESS]) ]) diff -Nru clamav-0.94.dfsg.1~rc1/Makefile.am clamav-0.94.dfsg.1/Makefile.am --- clamav-0.94.dfsg.1~rc1/Makefile.am 2008-10-15 06:40:51.000000000 -0400 +++ clamav-0.94.dfsg.1/Makefile.am 2008-10-30 12:03:03.000000000 -0400 @@ -28,7 +28,11 @@ # don't complain that configuration files and databases are not removed, this is intended distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print DISTCLEANFILES = target.h -DISTCHECK_CONFIGURE_FLAGS=--enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded" +if DISTCHECK_ENABLE_FLAGS +DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded" +else +DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav +endif lcov: ($(MAKE); cd unit_tests; $(MAKE) lcov) quick-check: diff -Nru clamav-0.94.dfsg.1~rc1/Makefile.in clamav-0.94.dfsg.1/Makefile.in --- clamav-0.94.dfsg.1~rc1/Makefile.in 2008-10-15 06:40:56.000000000 -0400 +++ clamav-0.94.dfsg.1/Makefile.in 2008-10-30 12:13:31.000000000 -0400 @@ -275,25 +275,49 @@ # don't complain that configuration files and databases are not removed, this is intended distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print DISTCLEANFILES = target.h -DISTCHECK_CONFIGURE_FLAGS = --enable-milter CFLAGS="-Wno-pointer-sign \ - -Wno-error=attributes -Werror-implicit-function-declaration \ - -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align \ - -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations \ - -Wmissing-prototypes -Wno-error=missing-prototypes \ - -Wnested-externs -Wno-error=nested-externs -Wpointer-arith \ - -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch \ - -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 \ - -Winit-self -Wmissing-include-dirs -Wstrict-aliasing \ - -Wdeclaration-after-statement -Waggregate-return \ - -Wmissing-format-attribute -Wno-error=missing-format-attribute \ - -Wpadded -Wno-error=type-limits -Wno-error=unused-value \ - -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual \ - -Wno-error=sign-compare -Wshadow -Wno-error=shadow \ - -Wno-error=uninitialized -fdiagnostics-show-option \ - -Wno-unused-parameter -Wpacked -Wno-error=packed \ - -Wno-error=unreachable-code -Winvalid-pch \ - -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 \ - -fstack-protector-all -Wstack-protector -Wno-error=padded" +@DISTCHECK_ENABLE_FLAGS_FALSE@DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav +@DISTCHECK_ENABLE_FLAGS_TRUE@DISTCHECK_CONFIGURE_FLAGS = \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ --enable-milter --disable-clamav \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ CFLAGS="-Wno-pointer-sign \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=attributes \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Werror-implicit-function-declaration \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Werror -Wextra -Wall \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wbad-function-cast -Wcast-align \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wendif-labels -Wfloat-equal \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wformat=2 -Wmissing-declarations \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wmissing-prototypes \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=missing-prototypes \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wnested-externs \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=nested-externs \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wpointer-arith \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wstrict-prototypes \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=strict-prototypes \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-switch -Wno-switch-enum \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wundef -Wwrite-strings \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wstrict-overflow=1 -Winit-self \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wmissing-include-dirs \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wstrict-aliasing \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wdeclaration-after-statement \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Waggregate-return \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wmissing-format-attribute \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=missing-format-attribute \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wpadded -Wno-error=type-limits \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=unused-value \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=unused-variable \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wcast-qual -Wno-error=cast-qual \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=sign-compare -Wshadow \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=shadow \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=uninitialized \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -fdiagnostics-show-option \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-unused-parameter -Wpacked \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=packed \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=unreachable-code \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Winvalid-pch \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=invalid-pch -O2 \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -D_FORTIFY_SOURCE=2 \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -fstack-protector-all \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wstack-protector \ +@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=padded" all: clamav-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -Nru clamav-0.94.dfsg.1~rc1/NEWS clamav-0.94.dfsg.1/NEWS --- clamav-0.94.dfsg.1~rc1/NEWS 2008-10-15 05:51:39.000000000 -0400 +++ clamav-0.94.dfsg.1/NEWS 2008-10-30 10:18:12.000000000 -0400 @@ -1,7 +1,7 @@ -0.94.1rc1 ---------- +0.94.1 +------ -ClamAV 0.94.1rc1 fixes some issues that were found in previous releases and +ClamAV 0.94.1 fixes some issues that were found in previous releases and includes one new feature, "Malware Statistics Gathering." This is an optional feature that allows ClamAV users optionally to submit statistics to us about what they detect in the field. We will then use these data to determine what diff -Nru clamav-0.94.dfsg.1~rc1/README clamav-0.94.dfsg.1/README --- clamav-0.94.dfsg.1~rc1/README 2008-10-15 05:51:26.000000000 -0400 +++ clamav-0.94.dfsg.1/README 2008-10-30 10:17:41.000000000 -0400 @@ -3,10 +3,10 @@ -- -0.94.1rc1 ---------- +0.94.1 +------ -ClamAV 0.94.1rc1 fixes some issues that were found in previous releases and +ClamAV 0.94.1 fixes some issues that were found in previous releases and includes one new feature, "Malware Statistics Gathering." This is an optional feature that allows ClamAV users optionally to submit statistics to us about what they detect in the field. We will then use these data to determine what diff -Nru clamav-0.94.dfsg.1~rc1/shared/cfgparser.c clamav-0.94.dfsg.1/shared/cfgparser.c --- clamav-0.94.dfsg.1~rc1/shared/cfgparser.c 2008-10-13 07:36:16.000000000 -0400 +++ clamav-0.94.dfsg.1/shared/cfgparser.c 2008-10-28 06:18:45.000000000 -0400 @@ -129,6 +129,7 @@ {"ConnectTimeout", OPT_NUM, 30, NULL, 0, OPT_FRESHCLAM}, {"ReceiveTimeout", OPT_NUM, 30, NULL, 0, OPT_FRESHCLAM}, {"SubmitDetectionStats", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM}, + {"DetectionStatsCountry", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM}, {"DevACOnly", OPT_BOOL, -1, NULL, 0, OPT_CLAMD}, {"DevACDepth", OPT_NUM, -1, NULL, 0, OPT_CLAMD}, diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_clamav.c clamav-0.94.dfsg.1/unit_tests/check_clamav.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_clamav.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_clamav.c 2008-10-24 05:08:37.000000000 -0400 @@ -326,7 +326,7 @@ sprintf(str, "%s/%s", srcdir, name); fd = open(str, O_RDONLY); - fail_unless(fd >= 0, "open() failed: %s", str); + fail_unless_fmt(fd >= 0, "open() failed: %s", str); free(str); return fd; } @@ -337,9 +337,9 @@ size_t p, reflen = len; char *buf = cli_malloc(len); - fail_unless(!!buf, "unable to malloc buffer: %d", len); + fail_unless_fmt(!!buf, "unable to malloc buffer: %d", len); p = read(fd, buf, len); - fail_unless(p == len, "file is smaller: %lu, expected: %lu", p, len); + fail_unless_fmt(p == len, "file is smaller: %lu, expected: %lu", p, len); p = 0; while(len > 0) { c1 = ref[p]; @@ -350,10 +350,10 @@ len--; } if (len > 0) - fail_unless(c1 == c2, "file contents mismatch at byte: %lu, was: %c, expected: %c", p, c2, c1); + fail_unless_fmt(c1 == c2, "file contents mismatch at byte: %lu, was: %c, expected: %c", p, c2, c1); free(buf); p = lseek(fd, 0, SEEK_END); - fail_unless(p == reflen, "trailing garbage, file size: %ld, expected: %ld", p, reflen); + fail_unless_fmt(p == reflen, "trailing garbage, file size: %ld, expected: %ld", p, reflen); close(fd); } @@ -362,14 +362,14 @@ char *ref; ssize_t nread; off_t siz = lseek(ref_fd, 0, SEEK_END); - fail_unless(siz != -1, "lseek failed"); + fail_unless_fmt(siz != -1, "lseek failed"); ref = cli_malloc(siz); - fail_unless(!!ref, "unable to malloc buffer: %d", siz); + fail_unless_fmt(!!ref, "unable to malloc buffer: %d", siz); - fail_unless(lseek(ref_fd, 0, SEEK_SET) == 0,"lseek failed"); + fail_unless_fmt(lseek(ref_fd, 0, SEEK_SET) == 0,"lseek failed"); nread = read(ref_fd, ref, siz); - fail_unless(nread == siz, "short read, expected: %ld, was: %ld", siz, nread); + fail_unless_fmt(nread == siz, "short read, expected: %ld, was: %ld", siz, nread); close(ref_fd); diff_file_mem(fd, ref, siz); free(ref); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_clamd.sh clamav-0.94.dfsg.1/unit_tests/check_clamd.sh --- clamav-0.94.dfsg.1~rc1/unit_tests/check_clamd.sh 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_clamd.sh 2008-10-24 05:08:37.000000000 -0400 @@ -222,7 +222,7 @@ wait $pid2 exitcode2=$? rm -rf clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2 test-db -if test $exitcode1 -ne 0 || test $exitcode2 -ne 0; then +if (test $exitcode1 -ne 0 && test $exitcode1 -ne 127) || (test $exitcode2 -ne 0 && test $exitcode2 -ne 127); then exit 1 fi exit 0 diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_disasm.c clamav-0.94.dfsg.1/unit_tests/check_disasm.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_disasm.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_disasm.c 2008-10-24 05:08:37.000000000 -0400 @@ -126,10 +126,10 @@ fail_unless(fstat(ref, &st)!=-1, "fstat failed"); disasmbuf(buf, sizeof(buf), fd); size = lseek(fd, 0, SEEK_CUR); - fail_unless(size==st.st_size, "disasm size mismatch(value %u, expected: %u)", size, st.st_size); + fail_unless_fmt(size==st.st_size, "disasm size mismatch(value %u, expected: %u)", size, st.st_size); lseek(fd, 0, SEEK_SET); d=malloc(size*2); - fail_unless(d!=NULL, "disasm malloc(%u) failed", size); + fail_unless_fmt(d!=NULL, "disasm malloc(%u) failed", size); fail_unless(read(ref, d, size)==size, "disasm reference read failed"); fail_unless(read(fd, d+size, size)==size, "disasm read failed"); close(fd); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_jsnorm.c clamav-0.94.dfsg.1/unit_tests/check_jsnorm.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_jsnorm.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_jsnorm.c 2008-10-24 05:08:37.000000000 -0400 @@ -252,7 +252,7 @@ fd = open(filename, O_RDONLY); if(fd < 0) { jstest_teardown(); - fail("failed to open output file: %s", filename); + fail_fmt("failed to open output file: %s", filename); } diff_file_mem(fd, expected, len); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_matchers.c clamav-0.94.dfsg.1/unit_tests/check_matchers.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_matchers.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_matchers.c 2008-10-24 05:08:37.000000000 -0400 @@ -77,8 +77,8 @@ for(i = 0; ac_testdata[i].data; i++) { ret = cli_ac_scanbuff(ac_testdata[i].data, strlen(ac_testdata[i].data), &virname, NULL, NULL, root, &mdata, 0, 0, -1, NULL, AC_SCAN_VIR, NULL); - fail_unless(ret == CL_VIRUS, "cli_ac_scanbuff() failed for %s", ac_testdata[i].virname); - fail_unless(!strncmp(virname, ac_testdata[i].virname, strlen(ac_testdata[i].virname)), "Dataset %u matched with %s", i, virname); + fail_unless_fmt(ret == CL_VIRUS, "cli_ac_scanbuff() failed for %s", ac_testdata[i].virname); + fail_unless_fmt(!strncmp(virname, ac_testdata[i].virname, strlen(ac_testdata[i].virname)), "Dataset %u matched with %s", i, virname); } cli_ac_freedata(&mdata); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_regex.c clamav-0.94.dfsg.1/unit_tests/check_regex.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_regex.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_regex.c 2008-10-24 05:08:37.000000000 -0400 @@ -52,7 +52,7 @@ { const char *expected = cbdata; cb_called++; - fail_unless(suffix && strcmp(suffix, expected) == 0, + fail_unless_fmt(suffix && strcmp(suffix, expected) == 0, "suffix mismatch, was: %s, expected: %s\n", suffix, expected); return 0; } @@ -107,11 +107,11 @@ const char **exp = cbdata; fail_unless(!!exp, "expected data"); exp++; - fail_unless(!!*exp, "expected no suffix, got: %s\n",suffix); - fail_unless(!!exp[cb_called], "expected less suffixes, but already got: %d\n", cb_called); - fail_unless(strcmp(exp[cb_called], suffix) == 0, + fail_unless_fmt(!!*exp, "expected no suffix, got: %s\n",suffix); + fail_unless_fmt(!!exp[cb_called], "expected less suffixes, but already got: %d\n", cb_called); + fail_unless_fmt(strcmp(exp[cb_called], suffix) == 0, "suffix mismatch, was: %s, expected: %s\n",suffix, exp[cb_called]); - fail_unless(strlen(suffix) == len, "incorrect suffix len, expected: %d, got: %d\n", strlen(suffix), len); + fail_unless_fmt(strlen(suffix) == len, "incorrect suffix len, expected: %d, got: %d\n", strlen(suffix), len); cb_called++; return 0; } @@ -134,7 +134,7 @@ free(preg); p++; while(*p++) n++; - fail_unless(cb_called == n, + fail_unless_fmt(cb_called == n, "suffix number mismatch, expected: %d, was: %d\n", n, cb_called); } END_TEST @@ -374,30 +374,30 @@ fail_unless(rc == CL_CLEAN,"phishingScan"); switch(rtest->result) { case 0: - fail_unless(ctx.found_possibly_unwanted, + fail_unless_fmt(ctx.found_possibly_unwanted, "this should be phishing, realURL: %s, displayURL: %s", rtest->realurl, rtest->displayurl); break; case 1: - fail_unless(!ctx.found_possibly_unwanted, + fail_unless_fmt(!ctx.found_possibly_unwanted, "this should be whitelisted, realURL: %s, displayURL: %s", rtest->realurl, rtest->displayurl); break; case 2: - fail_unless(!ctx.found_possibly_unwanted, + fail_unless_fmt(!ctx.found_possibly_unwanted, "this should be clean, realURL: %s, displayURL: %s", rtest->realurl, rtest->displayurl); break; case 3: if(!loaded_2) - fail_unless(!ctx.found_possibly_unwanted, + fail_unless_fmt(!ctx.found_possibly_unwanted, "this should be clean, realURL: %s, displayURL: %s", rtest->realurl, rtest->displayurl); else { - fail_unless(ctx.found_possibly_unwanted, + fail_unless_fmt(ctx.found_possibly_unwanted, "this should be blacklisted, realURL: %s, displayURL: %s", rtest->realurl, rtest->displayurl); - fail_unless(!strstr((const char*)ctx.virname,"Blacklisted"), + fail_unless_fmt(!strstr((const char*)ctx.virname,"Blacklisted"), "should be blacklisted, but is: %s\n", ctx.virname); } break; diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/checks.h clamav-0.94.dfsg.1/unit_tests/checks.h --- clamav-0.94.dfsg.1~rc1/unit_tests/checks.h 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/checks.h 2008-10-24 05:08:37.000000000 -0400 @@ -4,6 +4,15 @@ #if CHECK_MAJOR_VERSION > 0 || ( CHECK_MINOR_VERSION > 9 || ( CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 3)) #define CHECK_HAVE_LOOPS #endif + +#if CHECK_MAJOR_VERSION > 0 || ( CHECK_MINOR_VERSION > 9 || ( CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 0)) +#define fail_unless_fmt fail_unless +#define fail_fmt fail +#else +#define fail_unless_fmt(cond, msg, ...) fail_unless(cond, msg) +#define fail_fmt(msg, ...) fail(msg) +#endif + Suite *test_jsnorm_suite(void); Suite *test_str_suite(void); Suite *test_regex_suite(void); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/check_uniq.c clamav-0.94.dfsg.1/unit_tests/check_uniq.c --- clamav-0.94.dfsg.1~rc1/unit_tests/check_uniq.c 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/check_uniq.c 2008-10-24 05:08:37.000000000 -0400 @@ -59,12 +59,12 @@ for(i=0; tests[i].expected; i++) { u = uniq_add(U, tests[i].key, tests[i].key_len, &hash); - fail_unless(u==0 && strcmp(hash, tests[i].expected)==0, "uniq_add(%s) = %u - expected %s, got %s", tests[i].key, u, tests[i].expected, hash); + fail_unless_fmt(u==0 && strcmp(hash, tests[i].expected)==0, "uniq_add(%s) = %u - expected %s, got %s", tests[i].key, u, tests[i].expected, hash); } for(i=0; tests[i].expected; i++) { u = uniq_get(U, tests[i].key, tests[i].key_len, &hash); - fail_unless(u==1 && strcmp(hash, tests[i].expected)==0, "uniq_get(%s) = %u - expected %s, got %s", tests[i].key, u, tests[i].expected, hash); + fail_unless_fmt(u==1 && strcmp(hash, tests[i].expected)==0, "uniq_get(%s) = %u - expected %s, got %s", tests[i].key, u, tests[i].expected, hash); } uniq_free(U); @@ -86,7 +86,7 @@ for (i=0; i<4; i++) { u = uniq_add(U, tests[i], strlen(tests[i]), NULL); - fail_unless(u+i==4, "uniq_get(%s) = %u - expected %u", tests[i], u, 4-i); + fail_unless_fmt(u+i==4, "uniq_get(%s) = %u - expected %u", tests[i], u, 4-i); } uniq_free(U); diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/duma_tests.sh clamav-0.94.dfsg.1/unit_tests/duma_tests.sh --- clamav-0.94.dfsg.1~rc1/unit_tests/duma_tests.sh 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/duma_tests.sh 2008-10-28 05:37:14.000000000 -0400 @@ -1,9 +1,10 @@ #!/bin/sh # Run under duma +LIBDIRS=`../libtool --config | grep sys_lib_search_path_spec | sed -e 's/.*"\(.*\)"/\1/'` if test -z "$LIBDUMA"; then - for i in /usr/lib/libduma.so /usr/local/lib/libduma.so; do - if test -f "$i"; then - LIBDUMA="$i" + for i in $LIBDIRS; do + if test -f "$i/libduma.so"; then + LIBDUMA="$i/libduma.so" break; fi done diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/efence_tests.sh clamav-0.94.dfsg.1/unit_tests/efence_tests.sh --- clamav-0.94.dfsg.1~rc1/unit_tests/efence_tests.sh 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/efence_tests.sh 2008-10-24 05:08:37.000000000 -0400 @@ -1,9 +1,10 @@ #!/bin/sh # Run under electric-fence +LIBDIRS=`../libtool --config | grep sys_lib_search_path_spec | sed -e 's/.*"\(.*\)"/\1/'` if test -z "$LIBEFENCE"; then - for i in /usr/lib/libefence.so /usr/local/lib/libefence.so /opt/csw/lib/libefence.so; do - if test -f "$i"; then - LIBEFENCE="$i" + for i in $LIBDIRS; do + if test -f "$i/libefence.so"; then + LIBEFENCE="$i/libefence.so" break; fi done diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/test-freshclam.conf clamav-0.94.dfsg.1/unit_tests/test-freshclam.conf --- clamav-0.94.dfsg.1~rc1/unit_tests/test-freshclam.conf 2008-07-15 04:15:18.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/test-freshclam.conf 2008-10-30 10:16:51.000000000 -0400 @@ -1,143 +1 @@ -## -## Example config file for freshclam -## Please read the freshclam.conf(5) manual before editing this file. -## - - -# Comment or remove the line below. -#Example - -# Path to the database directory. -# WARNING: It must match clamd.conf's directive! -# Default: hardcoded (depends on installation options) -#DatabaseDirectory /var/lib/clamav - -# Path to the log file (make sure it has proper permissions) -# Default: disabled -#UpdateLogFile /var/log/freshclam.log - -# Maximum size of the log file. -# Value of 0 disables the limit. -# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes) -# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). -# in bytes just don't use modifiers. -# Default: 1M -#LogFileMaxSize 2M - -# Log time with each message. -# Default: no -#LogTime yes - -# Enable verbose logging. -# Default: no -#LogVerbose yes - -# Use system logger (can work together with UpdateLogFile). -# Default: no -#LogSyslog yes - -# Specify the type of syslog messages - please refer to 'man syslog' -# for facility names. -# Default: LOG_LOCAL6 -#LogFacility LOG_MAIL - -# This option allows you to save the process identifier of the daemon -# Default: disabled -#PidFile /var/run/freshclam.pid - -# By default when started freshclam drops privileges and switches to the -# "clamav" user. This directive allows you to change the database owner. -# Default: clamav (may depend on installation options) -#DatabaseOwner clamav - -# Initialize supplementary group access (freshclam must be started by root). -# Default: no -#AllowSupplementaryGroups yes - -# Use DNS to verify virus database version. Freshclam uses DNS TXT records -# to verify database and software versions. With this directive you can change -# the database verification domain. -# WARNING: Do not touch it unless you're configuring freshclam to use your -# own database verification domain. -# Default: current.cvd.clamav.net -#DNSDatabaseInfo current.cvd.clamav.net - -# Uncomment the following line and replace XY with your country -# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. -#DatabaseMirror db.XY.clamav.net - -# database.clamav.net is a round-robin record which points to our most -# reliable mirrors. It's used as a fall back in case db.XY.clamav.net is -# not working. DO NOT TOUCH the following line unless you know what you -# are doing. -DatabaseMirror database.clamav.net - -# How many attempts to make before giving up. -# Default: 3 (per mirror) -#MaxAttempts 5 - -# With this option you can control scripted updates. It's highly recommended -# to keep it enabled. -# Default: yes -#ScriptedUpdates yes - -# By default freshclam will keep the local databases (.cld) uncompressed to -# make their handling faster. With this option you can enable the compression; -# the change will take effect with the next database update. -# Default: no -#CompressLocalDatabase no - -# Number of database checks per day. -# Default: 12 (every two hours) -#Checks 24 - -# Proxy settings -# Default: disabled -#HTTPProxyServer myproxy.com -#HTTPProxyPort 1234 -#HTTPProxyUsername myusername -#HTTPProxyPassword mypass - -# If your servers are behind a firewall/proxy which applies User-Agent -# filtering you can use this option to force the use of a different -# User-Agent header. -# Default: clamav/version_number -#HTTPUserAgent SomeUserAgentIdString - -# Use aaa.bbb.ccc.ddd as client address for downloading databases. Useful for -# multi-homed systems. -# Default: Use OS'es default outgoing IP address. -#LocalIPAddress aaa.bbb.ccc.ddd - -# Send the RELOAD command to clamd. -# Default: no -#NotifyClamd /path/to/clamd.conf - -# Run command after successful database update. -# Default: disabled -#OnUpdateExecute command - -# Run command when database update process fails. -# Default: disabled -#OnErrorExecute command - -# Run command when freshclam reports outdated version. -# In the command string %v will be replaced by the new version number. -# Default: disabled -#OnOutdatedExecute command - -# Don't fork into background. -# Default: no -#Foreground yes - -# Enable debug messages in libclamav. -# Default: no -#Debug yes - -# Timeout in seconds when connecting to database server. -# Default: 30 -#ConnectTimeout 60 - -# Timeout in seconds when reading from database server. -# Default: 30 -#ReceiveTimeout 60 +DatabaseMirror 127.0.0.1 diff -Nru clamav-0.94.dfsg.1~rc1/unit_tests/valgrind.supp clamav-0.94.dfsg.1/unit_tests/valgrind.supp --- clamav-0.94.dfsg.1~rc1/unit_tests/valgrind.supp 2008-10-11 15:58:45.000000000 -0400 +++ clamav-0.94.dfsg.1/unit_tests/valgrind.supp 2008-10-30 10:16:50.000000000 -0400 @@ -131,6 +131,14 @@ fun:ctime_r } { + helgrind-glibc27-dbg15 + Helgrind:Race + fun:* + fun:* + fun:* + fun:ctime_r +} +{ helgrind-glibc27-dbg14 Helgrind:Race fun:_IO_link_in @@ -181,6 +189,63 @@ Helgrind:Race fun:fputs } +{ + glibc-fork + Helgrind:Race + fun:fork +} +{ + glibc-fork + Helgrind:Race + fun:* + fun:fork +} +{ + glibc-freetcb + Helgrind:Race + fun:__free_tcb +} +{ + glibc-2.5-strcpy_chk + Memcheck:Addr8 + obj:/lib64/libc-2.5.so + fun:decodeLine +} +{ + glibc-2.5-strcpy_chk + Memcheck:Cond + obj:/lib64/libc-2.5.so + fun:decodeLine +} +{ + glibc-2.5-strcpy_chk + Memcheck:Cond + obj:/lib64/libc-2.5.so + fun:cli_mbox +} +{ + glibc-2.8-lll + Helgrind:Race + fun:__lll_unlock_wake +} +{ + glibc-freeres + Helgrind:Race + fun: * + fun: __libc_thread_freeres +} +{ + glibc-poll + Helgrind:Race + fun: __libc_enable_asynccancel + fun: poll +} +{ + glibc-poll + Helgrind:Race + fun: _setjmp + fun: clone +} #{ # helgrind-glibc27-dbg18 # Helgrind:Race