diff -u -r -N squid-3.4.4/acinclude/ax_cxx_compile_stdcxx_0x.m4 squid-3.4.4.1/acinclude/ax_cxx_compile_stdcxx_0x.m4 --- squid-3.4.4/acinclude/ax_cxx_compile_stdcxx_0x.m4 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/acinclude/ax_cxx_compile_stdcxx_0x.m4 1969-12-31 16:00:00.000000000 -0800 @@ -1,107 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_0X -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++0x -# standard. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 7 - -AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X]) -AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [ - AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, - ax_cv_cxx_compile_cxx0x_native, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c);],, - ax_cv_cxx_compile_cxx0x_native=yes, ax_cv_cxx_compile_cxx0x_native=no) - AC_LANG_RESTORE - ]) - - AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, - ax_cv_cxx_compile_cxx0x_cxx, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++0x" - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c);],, - ax_cv_cxx_compile_cxx0x_cxx=yes, ax_cv_cxx_compile_cxx0x_cxx=no) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, - ax_cv_cxx_compile_cxx0x_gxx, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=gnu++0x" - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c);],, - ax_cv_cxx_compile_cxx0x_gxx=yes, ax_cv_cxx_compile_cxx0x_gxx=no) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - if test "$ax_cv_cxx_compile_cxx0x_native" = yes || - test "$ax_cv_cxx_compile_cxx0x_cxx" = yes || - test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then - AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) - fi -]) diff -u -r -N squid-3.4.4/acinclude/ax_cxx_compile_stdcxx_11.m4 squid-3.4.4.1/acinclude/ax_cxx_compile_stdcxx_11.m4 --- squid-3.4.4/acinclude/ax_cxx_compile_stdcxx_11.m4 1969-12-31 16:00:00.000000000 -0800 +++ squid-3.4.4.1/acinclude/ax_cxx_compile_stdcxx_11.m4 2014-04-23 05:50:18.000000000 -0700 @@ -0,0 +1,142 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++11 +# standard; if necessary, add switches to CXXFLAGS to enable support. +# +# The first argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The second argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline C++11 support is required and that the macro +# should error out if no mode with that support is found. If specified +# 'optional', then configuration proceeds regardless, after defining +# HAVE_CXX11 if and only if a supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014 Alexey Sokolov +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c); + + auto d = a; + auto l = [](){}; +]]) + +AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl + m4_if([$1], [], [], + [$1], [ext], [], + [$1], [noext], [], + [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl + m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], + [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], + [$2], [optional], [ax_cxx_compile_cxx11_required=false], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + AC_CACHE_CHECK(whether $CXX supports C++11 features by default, + ax_cv_cxx_compile_cxx11, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [ax_cv_cxx_compile_cxx11=yes], + [ax_cv_cxx_compile_cxx11=no])]) + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + m4_if([$1], [noext], [], [dnl + if test x$ac_success = xno; then + for switch in -std=gnu++11 -std=gnu++0x; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, + $cachevar, + [ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXXFLAGS="$ac_save_CXXFLAGS"]) + if eval test x\$$cachevar = xyes; then + CXXFLAGS="$CXXFLAGS $switch" + ac_success=yes + break + fi + done + fi]) + + m4_if([$1], [ext], [], [dnl + if test x$ac_success = xno; then + for switch in -std=c++11 -std=c++0x; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, + $cachevar, + [ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXXFLAGS="$ac_save_CXXFLAGS"]) + if eval test x\$$cachevar = xyes; then + CXXFLAGS="$CXXFLAGS $switch" + ac_success=yes + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) + fi + else + if test x$ac_success = xno; then + HAVE_CXX11=0 + AC_MSG_NOTICE([No compiler with C++11 support was found]) + else + HAVE_CXX11=1 + AC_DEFINE(HAVE_CXX11,1, + [define if the compiler supports basic C++11 syntax]) + fi + + AC_SUBST(HAVE_CXX11) + fi +]) diff -u -r -N squid-3.4.4/aclocal.m4 squid-3.4.4.1/aclocal.m4 --- squid-3.4.4/aclocal.m4 2014-03-09 01:41:27.000000000 -0800 +++ squid-3.4.4.1/aclocal.m4 2014-04-23 05:50:34.000000000 -0700 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +142,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +159,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +172,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +186,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +245,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +302,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +312,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +357,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +369,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +399,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,18 +409,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -432,7 +436,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -461,31 +465,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,34 +509,79 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -545,7 +603,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +622,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -590,20 +646,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -611,13 +664,14 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -625,18 +679,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -654,7 +704,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -679,52 +729,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -732,11 +744,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -749,63 +760,35 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -816,7 +799,54 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -835,22 +865,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -861,32 +885,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -896,9 +928,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -906,34 +1014,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -941,24 +1047,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -968,75 +1072,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR @@ -1109,7 +1252,7 @@ ;; #( *) lt_cv_sys_argz_works=yes ;; esac]]) - AS_IF([test $lt_cv_sys_argz_works = yes], + AS_IF([test "$lt_cv_sys_argz_works" = yes], [AC_DEFINE([HAVE_WORKING_ARGZ], 1, [This value is set to 1 to indicate that the system argz facility works])], [ARGZ_H=argz.h @@ -1124,8 +1267,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -1134,8 +1277,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -1269,6 +1412,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1291,10 +1436,13 @@ dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -1751,7 +1899,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1865,15 +2013,12 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -1918,6 +2063,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1939,6 +2085,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1969,6 +2138,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -2071,7 +2244,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -2079,6 +2258,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -2090,6 +2270,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -2107,7 +2288,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -2152,8 +2335,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -2164,6 +2347,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -2190,30 +2375,41 @@ fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # 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. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_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 +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`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 "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX @@ -2238,7 +2434,7 @@ AC_MSG_CHECKING([how to print strings]) # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -2282,6 +2478,39 @@ ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -2341,7 +2570,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -2353,9 +2582,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -2374,7 +2613,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -2403,14 +2645,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2428,14 +2683,47 @@ ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -2454,13 +2742,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2640,6 +2928,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -2666,7 +2959,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$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 @@ -2679,7 +2973,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2775,10 +3069,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -3225,7 +3519,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -3234,7 +3528,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -3299,7 +3593,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -3318,8 +3612,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -3352,13 +3647,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -3379,7 +3732,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3387,10 +3740,6 @@ 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. @@ -3398,7 +3747,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3416,7 +3765,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3435,18 +3784,8 @@ 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 - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3507,7 +3846,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3523,7 +3862,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3560,9 +3899,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3606,6 +3945,18 @@ 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 @@ -3625,7 +3976,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3694,7 +4045,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3719,7 +4070,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3743,7 +4094,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3774,7 +4125,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3784,7 +4135,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -4062,6 +4413,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -4160,10 +4516,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -4201,12 +4553,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -4280,6 +4632,21 @@ ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -4287,7 +4654,11 @@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -4390,6 +4761,67 @@ dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + # LT_LIB_M # -------- @@ -4516,8 +4948,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -4541,6 +4973,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4553,6 +4986,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4586,6 +5020,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -4597,7 +5043,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -4623,15 +5069,15 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_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" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -4664,6 +5110,13 @@ AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -4674,6 +5127,8 @@ _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -4685,7 +5140,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -4790,6 +5244,12 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # 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_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -4846,7 +5306,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4910,7 +5370,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -5098,7 +5558,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -5143,7 +5605,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -5164,6 +5626,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -5184,11 +5652,16 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; *Sun\ F* | *Sun*Fortran*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; *Sun\ C*) # Sun C 5.9 @@ -5196,6 +5669,16 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5283,9 +5766,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -5304,6 +5789,8 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -5324,6 +5811,7 @@ m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -5332,6 +5820,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. @@ -5346,15 +5835,25 @@ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_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' - ;; + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -5369,7 +5868,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5414,6 +5912,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5522,7 +6023,8 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5570,7 +6072,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -5619,8 +6121,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5635,13 +6136,13 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -5659,8 +6160,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -5706,8 +6207,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -5812,6 +6313,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5837,7 +6339,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else @@ -5848,7 +6350,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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. @@ -5892,20 +6394,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -5918,10 +6464,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_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 @@ -5934,7 +6476,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5943,7 +6485,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5951,7 +6493,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${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_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 @@ -5967,13 +6509,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5991,10 +6532,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -6041,16 +6582,31 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -6062,7 +6618,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6135,7 +6691,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' @@ -6154,9 +6710,9 @@ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -6400,9 +6956,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [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]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6428,8 +6981,6 @@ to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -6440,6 +6991,8 @@ [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -6537,6 +7090,7 @@ m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then @@ -6555,7 +7109,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6598,6 +7151,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -6615,6 +7169,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6636,8 +7191,8 @@ # 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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_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_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6778,7 +7333,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -6790,7 +7345,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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. @@ -6832,29 +7387,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_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_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_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_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_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_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -6877,7 +7478,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6893,9 +7494,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6929,7 +7527,7 @@ ;; *) if test "$GXX" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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_TAGVAR(ld_shlibs, $1)=no @@ -7000,10 +7598,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -7044,9 +7642,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -7057,7 +7655,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -7324,7 +7922,7 @@ _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -7411,9 +8009,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_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' + $CC -shared $pic_flag -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 @@ -7542,6 +8140,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -7556,6 +8155,29 @@ ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7564,6 +8186,7 @@ # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -7613,7 +8236,20 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -7625,7 +8261,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -7634,13 +8270,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -7660,8 +8305,10 @@ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -7697,6 +8344,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -7796,7 +8444,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7846,7 +8493,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7900,6 +8549,7 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -7926,7 +8576,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7976,7 +8625,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -8032,7 +8683,8 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -8069,10 +8721,12 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -8099,10 +8753,78 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_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_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8134,9 +8856,11 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -8149,7 +8873,8 @@ GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -8169,6 +8894,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -8208,6 +8940,15 @@ AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -8299,8 +9040,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -8339,213 +9080,169 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -_LT_EOF -esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac ]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- # -# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1999-2006, 2007, 2008, 2011 Free Software Foundation, Inc. # Written by Thomas Tanner, 1999 # # This file is free software; the Free Software Foundation gives @@ -8955,8 +9652,13 @@ m4_pattern_allow([LT_LIBEXT])dnl AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) +name= +eval "lt_libprefix=\"$libname_spec\"" +m4_pattern_allow([LT_LIBPREFIX])dnl +AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix]) + name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +eval "LTDLOPEN=\"$libname_spec\"" AC_SUBST([LTDLOPEN]) ])# _LTDL_SETUP @@ -9033,7 +9735,7 @@ # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@ -9093,12 +9795,19 @@ [ module=yes eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds ]) if test -n "$libltdl_cv_shlibext"; then m4_pattern_allow([LT_MODULE_EXT])dnl AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], [Define to the extension used for runtime loadable modules, say, ".so".]) fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + m4_pattern_allow([LT_SHARED_EXT])dnl + AC_DEFINE_UNQUOTED([LT_SHARED_EXT], ["$libltdl_cv_shrext"], + [Define to the shared library suffix, say, ".dylib".]) +fi ])# LT_SYS_MODULE_EXT # Old name: @@ -9674,9 +10383,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -9846,17 +10570,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3175 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.10]) -m4_define([LT_PACKAGE_REVISION], [1.3175]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.10' -macro_revision='1.3175' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -u -r -N squid-3.4.4/cfgaux/compile squid-3.4.4.1/cfgaux/compile --- squid-3.4.4/cfgaux/compile 2014-03-09 01:41:37.000000000 -0800 +++ squid-3.4.4.1/cfgaux/compile 2014-04-23 05:50:58.000000000 -0700 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -u -r -N squid-3.4.4/cfgaux/config.guess squid-3.4.4.1/cfgaux/config.guess --- squid-3.4.4/cfgaux/config.guess 2014-03-09 01:41:37.000000000 -0800 +++ squid-3.4.4.1/cfgaux/config.guess 2014-04-23 05:50:58.000000000 -0700 @@ -1,13 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2003-07-02' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,24 +15,22 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# along with this program; if not, see . # # 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. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +62,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +100,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +119,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -136,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -158,6 +175,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -166,7 +184,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -176,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -196,50 +214,36 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,42 +281,52 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -320,32 +334,51 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +387,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +402,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -382,38 +415,41 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,35 +473,36 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -478,29 +515,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -508,7 +545,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -523,15 +560,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -544,28 +585,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -574,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -627,9 +668,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -637,11 +688,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -669,321 +720,345 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/FreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -991,15 +1066,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1091,68 +1180,99 @@ else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; - esac + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1160,22 +1280,28 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1186,33 +1312,55 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1328,11 +1476,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1341,22 +1490,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1367,7 +1516,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -u -r -N squid-3.4.4/cfgaux/config.sub squid-3.4.4.1/cfgaux/config.sub --- squid-3.4.4/cfgaux/config.sub 2014-03-09 01:41:38.000000000 -0800 +++ squid-3.4.4.1/cfgaux/config.sub 2014-04-23 05:50:58.000000000 -0700 @@ -1,42 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2003-07-04' +timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 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. +# 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# along with this program; if not, see . +# # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +80,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +96,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,10 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -144,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -162,13 +170,17 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -202,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -226,55 +248,106 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -290,58 +363,82 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -359,6 +456,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -376,6 +476,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -399,6 +502,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -407,10 +514,35 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -435,12 +567,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -463,6 +610,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -574,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -613,6 +767,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -624,10 +786,21 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -641,10 +814,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -657,10 +826,21 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -725,9 +905,11 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem @@ -736,9 +918,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -756,6 +941,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -765,6 +958,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -794,9 +993,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -821,6 +1021,14 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -847,6 +1055,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -858,6 +1070,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -879,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -935,17 +1153,9 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -960,6 +1170,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1003,9 +1217,16 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1014,6 +1235,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1033,6 +1258,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1049,13 +1277,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1099,9 +1324,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1122,25 +1350,31 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1158,12 +1392,15 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1176,6 +1413,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1197,6 +1437,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1219,6 +1462,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1252,8 +1498,13 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) ;; -none) ;; @@ -1277,6 +1528,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1286,9 +1543,24 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1307,19 +1579,22 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1332,9 +1607,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1437,7 +1718,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1467,9 +1748,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1494,7 +1781,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -u -r -N squid-3.4.4/cfgaux/depcomp squid-3.4.4.1/cfgaux/depcomp --- squid-3.4.4/cfgaux/depcomp 2014-03-09 01:41:58.000000000 -0800 +++ squid-3.4.4.1/cfgaux/depcomp 2014-04-23 05:51:39.000000000 -0700 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -u -r -N squid-3.4.4/cfgaux/install-sh squid-3.4.4.1/cfgaux/install-sh --- squid-3.4.4/cfgaux/install-sh 2014-03-09 01:41:38.000000000 -0800 +++ squid-3.4.4.1/cfgaux/install-sh 2014-04-23 05:50:58.000000000 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -u -r -N squid-3.4.4/cfgaux/ltmain.sh squid-3.4.4.1/cfgaux/ltmain.sh --- squid-3.4.4/cfgaux/ltmain.sh 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/cfgaux/ltmain.sh 2014-04-23 05:50:41.000000000 -0700 @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.2.10 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -42,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -70,17 +70,19 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.10 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 # automake: $automake_version # autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.10 +VERSION="2.4.2 Debian-2.4.2-1.7" TIMESTAMP="" -package_revision=1.3175 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -135,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -163,6 +160,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -177,17 +195,31 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation -# Generated shell functions inserted here. # These SED scripts presuppose an absolute path with a trailing slash. pathcar='s,^/\([^/]*\).*$,\1,' @@ -351,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -370,6 +402,15 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -398,7 +439,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -424,14 +465,14 @@ # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -650,11 +691,30 @@ fi } +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + # func_version # Echo version message to standard output and exit. func_version () { + $opt_debug + $SED -n '/(C)/!b go :more /\./!{ @@ -676,6 +736,8 @@ # Echo short help message to standard output and exit. func_usage () { + $opt_debug + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// @@ -692,7 +754,10 @@ # unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -702,10 +767,14 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" ret=$? if test -z "$1"; then exit $ret @@ -717,12 +786,39 @@ # exit_cmd. func_missing_arg () { + $opt_debug + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: @@ -732,25 +828,64 @@ magic_exe="%%%MAGIC EXE variable%%%" # Global variables. -# $mode is unset nonopt= -execute_dlfiles= preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. exec_cmd= +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -840,129 +975,209 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - opt_verbose=false + opt_preserve_dup_deps=: ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false + --features) + opt_features=: +func_features ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false - opt_verbose=: +func_append preserve_args " $opt" ;; - - --no-verbose) preserve_args="$preserve_args $opt" + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) opt_verbose=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --help-all) opt_help=': help-all' ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -970,82 +1185,44 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1110,12 +1287,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1161,6 +1335,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1170,26 +1375,10 @@ func_infer_tag () { $opt_debug - - # FreeBSD-specific: where we install compilers with non-standard names - tag_compilers_CC="*cc cc* *gcc gcc* clang" - tag_compilers_CXX="*c++ c++* *g++ g++* clang++" - base_compiler=`set -- "$@"; echo $1` - - # If $tagname isn't set, then try to infer if the default "CC" tag applies - if test -z "$tagname"; then - for zp in $tag_compilers_CC; do - case $base_compiler in - $zp) tagname="CC"; break;; - esac - done - fi - if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1208,8 +1397,7 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1223,22 +1411,7 @@ break ;; esac - - # FreeBSD-specific: try compilers based on inferred tag - if test -z "$tagname"; then - eval "tag_compilers=\$tag_compilers_${z}" - if test -n "$tag_compilers"; then - for zp in $tag_compilers; do - case $base_compiler in - $zp) tagname=$z; break;; - esac - done - if test -n "$tagname"; then - break - fi - fi - fi - fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -1288,10 +1461,490 @@ # Name of the non-PIC object non_pic_object=$write_oldobj -EOF - $MV "${write_libobj}T" "${write_libobj}" - } +EOF + $MV "${write_libobj}T" "${write_libobj}" + } +} + + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi } +# end func_convert_path_nix_to_cygwin + # func_mode_compile arg... func_mode_compile () @@ -1333,12 +1986,12 @@ ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1359,15 +2012,14 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1383,8 +2035,7 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1409,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1515,17 +2166,16 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1545,7 +2195,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1592,11 +2242,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1641,13 +2291,13 @@ } $opt_help || { - test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1823,7 +2473,7 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac @@ -1838,13 +2488,13 @@ else { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done } | sed -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do echo func_mode_help done @@ -1873,13 +2523,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1901,7 +2554,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1958,8 +2611,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1991,22 +2643,59 @@ fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2016,7 +2705,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -2025,53 +2714,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2096,7 +2787,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -2116,7 +2807,7 @@ do arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -2154,11 +2845,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then func_quote_for_eval "$arg2" fi - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2170,7 +2861,7 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -2228,10 +2919,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2245,19 +2939,19 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. @@ -2334,7 +3028,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2508,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2531,7 +3227,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2578,6 +3274,18 @@ #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2589,8 +3297,9 @@ # Add our own program objects to the symbol list. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2639,10 +3348,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2680,26 +3431,9 @@ const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - echo >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - echo >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2739,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2755,7 +3489,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2783,9 +3517,6 @@ ;; esac ;; - *-*-freebsd*) - # FreeBSD doesn't need this... - ;; *) func_fatal_error "unknown suffix for \`$my_dlsyms'" ;; @@ -2821,7 +3552,8 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - win32_nmres=`eval $NM -f posix -A $1 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2850,6 +3582,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -3128,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -3228,6 +4088,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -3242,14 +4114,6 @@ " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. @@ -3267,166 +4131,6 @@ } -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist - # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout # Must ONLY be called from within func_mode_link because @@ -3596,14 +4300,14 @@ EOF cat </dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7050,7 +7833,7 @@ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7075,7 +7858,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7091,7 +7874,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -7104,7 +7887,7 @@ potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7129,7 +7912,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7233,7 +8016,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7243,10 +8026,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -7258,15 +8041,22 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -7275,18 +8065,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -7294,17 +8084,13 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -7312,7 +8098,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -7338,7 +8124,7 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -7349,7 +8135,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7380,13 +8166,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7420,7 +8238,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7430,7 +8248,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7450,21 +8268,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7526,10 +8344,13 @@ echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done echo ')' >> $output - delfiles="$delfiles $output" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7543,10 +8364,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7597,7 +8420,7 @@ if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7631,7 +8454,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7664,7 +8487,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7705,10 +8528,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7724,7 +8547,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7736,7 +8559,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7820,13 +8643,16 @@ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test @@ -7900,8 +8726,8 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -7921,7 +8747,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7931,17 +8757,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7949,7 +8775,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7968,18 +8794,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7988,12 +8814,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -8019,18 +8845,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -8081,6 +8907,12 @@ exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8103,7 +8935,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8111,7 +8943,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8126,6 +8958,13 @@ $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -8159,6 +8998,12 @@ func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -8256,7 +9101,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -8264,10 +9109,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -8278,10 +9123,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -8299,7 +9144,7 @@ else echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -8323,18 +9168,30 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8428,12 +9285,23 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8447,9 +9315,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8466,7 +9334,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8478,7 +9346,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8487,7 +9355,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -8572,7 +9440,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8592,9 +9460,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8603,24 +9471,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8646,18 +9513,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8685,19 +9551,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8707,7 +9573,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8716,7 +9582,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8724,12 +9590,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8737,7 +9603,6 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8749,16 +9614,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -u -r -N squid-3.4.4/cfgaux/missing squid-3.4.4.1/cfgaux/missing --- squid-3.4.4/cfgaux/missing 2014-03-09 01:41:38.000000000 -0800 +++ squid-3.4.4.1/cfgaux/missing 2014-04-23 05:50:58.000000000 -0700 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 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 @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -u -r -N squid-3.4.4/cfgaux/test-driver squid-3.4.4.1/cfgaux/test-driver --- squid-3.4.4/cfgaux/test-driver 1969-12-31 16:00:00.000000000 -0800 +++ squid-3.4.4.1/cfgaux/test-driver 2014-04-23 05:51:39.000000000 -0700 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# 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, 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, see . + +# 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. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -u -r -N squid-3.4.4/ChangeLog squid-3.4.4.1/ChangeLog --- squid-3.4.4/ChangeLog 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/ChangeLog 2014-04-23 05:50:18.000000000 -0700 @@ -1,3 +1,21 @@ +Changes to squid-3.4.4.1 (23 Apr 2014): + + - Regression Bug 4019: Cache digest exchange segmentation fault + - Regression Bug 3982: EUI logging and helpers show blank MAC address + - Bug 4047: Support Android builds + - Bug 4043: Remove XMALLOC_TRACE and references to sbrk(2) + - Bug 4041: Missing files in compat/Makefile.am + - Bug 4014: Build failure with --disable-optimizations --disable-auth + - Bug 3986: (partial) assertion due to incorrect error page buffer size + - Bug 3955: Solaris EUI-48 lookup leaks FDs + - Bug 3371: CONNECT with data sent at once loses data + - C++11: Upgrade auto-detection to use the formal -std=c++11 + - Crypto-NG: libnettle MD5 algorithm support + - SSL-Bump: Fix Basic auth caching on bumped connections + - Store-ID: Fix request URI when forwarding requests to peers + - ... and fix several other build errors + - ... and some documentation updates + Changes to squid-3.4.4 (09 Mar 2014): - Bug 4029: intercepted HTTPS requests bypass caching checks diff -u -r -N squid-3.4.4/compat/compat.h squid-3.4.4.1/compat/compat.h --- squid-3.4.4/compat/compat.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/compat/compat.h 2014-04-23 05:50:18.000000000 -0700 @@ -56,6 +56,7 @@ /*****************************************************/ #include "compat/os/aix.h" +#include "compat/os/android.h" #include "compat/os/dragonfly.h" #include "compat/os/freebsd.h" #include "compat/os/hpux.h" diff -u -r -N squid-3.4.4/compat/Makefile.am squid-3.4.4.1/compat/Makefile.am --- squid-3.4.4/compat/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/compat/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -56,6 +56,7 @@ xstrto.h \ \ os/aix.h \ + os/android.h \ os/dragonfly.h \ os/freebsd.h \ os/hpux.h \ @@ -73,7 +74,7 @@ os/solaris.h \ os/sunos.h -libcompat_squid_la_LIBADD= $(LIBOBJS) +libcompat_squid_la_LIBADD= $(LTLIBOBJS) check_PROGRAMS += testPreCompiler TESTS += testPreCompiler diff -u -r -N squid-3.4.4/compat/Makefile.in squid-3.4.4.1/compat/Makefile.in --- squid-3.4.4/compat/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/compat/Makefile.in 2014-04-23 05:50:59.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,51 @@ # VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,10 +82,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am drand48.c getaddrinfo.c \ - getnameinfo.c inet_ntop.c inet_pton.c initgroups.c psignal.c \ - strerror.c strtoll.c tempnam.c +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am getaddrinfo.c psignal.c strtoll.c \ + inet_pton.c drand48.c inet_ntop.c tempnam.c initgroups.c \ + getnameinfo.c strerror.c $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testPreCompiler$(EXEEXT) TESTS = testPreCompiler$(EXEEXT) testHeaders @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -54,7 +99,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -110,54 +155,314 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libcompat_squid_la_DEPENDENCIES = $(LIBOBJS) +libcompat_squid_la_DEPENDENCIES = $(LTLIBOBJS) am_libcompat_squid_la_OBJECTS = assert.lo compat.lo debug.lo \ eui64_aton.lo GnuRegex.lo shm.lo strnstr.lo strnrchr.lo \ xalloc.lo xstrerror.lo xstring.lo xstrto.lo mswindows.lo libcompat_squid_la_OBJECTS = $(am_libcompat_squid_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_testPreCompiler_OBJECTS = testPreCompiler.$(OBJEXT) \ testMain.$(OBJEXT) testPreCompiler_OBJECTS = $(am_testPreCompiler_OBJECTS) am__DEPENDENCIES_1 = testPreCompiler_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -testPreCompiler_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(testPreCompiler_LDFLAGS) $(LDFLAGS) -o $@ +testPreCompiler_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(testPreCompiler_LDFLAGS) \ + $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libcompat_squid_la_SOURCES) $(testPreCompiler_SOURCES) DIST_SOURCES = $(libcompat_squid_la_SOURCES) \ $(testPreCompiler_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -196,6 +501,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -213,6 +519,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -250,11 +557,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -313,6 +622,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -428,6 +738,7 @@ xstrto.h \ \ os/aix.h \ + os/android.h \ os/dragonfly.h \ os/freebsd.h \ os/hpux.h \ @@ -445,7 +756,7 @@ os/solaris.h \ os/sunos.h -libcompat_squid_la_LIBADD = $(LIBOBJS) +libcompat_squid_la_LIBADD = $(LTLIBOBJS) testPreCompiler_SOURCES = \ testPreCompiler.h \ testPreCompiler.cc \ @@ -456,7 +767,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .cc .lo .o .obj +.SUFFIXES: .c .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -478,6 +789,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -490,14 +802,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libcompat-squid.la: $(libcompat_squid_la_OBJECTS) $(libcompat_squid_la_DEPENDENCIES) - $(CXXLINK) $(libcompat_squid_la_OBJECTS) $(libcompat_squid_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libcompat-squid.la: $(libcompat_squid_la_OBJECTS) $(libcompat_squid_la_DEPENDENCIES) $(EXTRA_libcompat_squid_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libcompat_squid_la_OBJECTS) $(libcompat_squid_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -507,9 +822,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -testPreCompiler$(EXEEXT): $(testPreCompiler_OBJECTS) $(testPreCompiler_DEPENDENCIES) + +testPreCompiler$(EXEEXT): $(testPreCompiler_OBJECTS) $(testPreCompiler_DEPENDENCIES) $(EXTRA_testPreCompiler_DEPENDENCIES) @rm -f testPreCompiler$(EXEEXT) - $(testPreCompiler_LINK) $(testPreCompiler_OBJECTS) $(testPreCompiler_LDADD) $(LIBS) + $(AM_V_CXXLD)$(testPreCompiler_LINK) $(testPreCompiler_OBJECTS) $(testPreCompiler_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -517,16 +833,16 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/drand48.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getaddrinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getnameinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psignal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoll.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/drand48.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getaddrinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getnameinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psignal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoll.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GnuRegex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assert.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Plo@am__quote@ @@ -544,60 +860,60 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrto.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< testMain.o: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc testMain.obj: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -605,26 +921,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -636,15 +941,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -653,101 +954,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testPreCompiler.log: testPreCompiler$(EXEEXT) + @p='testPreCompiler$(EXEEXT)'; \ + b='testPreCompiler'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -795,11 +1189,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -884,19 +1286,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/compat/os/android.h squid-3.4.4.1/compat/os/android.h --- squid-3.4.4/compat/os/android.h 1969-12-31 16:00:00.000000000 -0800 +++ squid-3.4.4.1/compat/os/android.h 2014-04-23 05:50:18.000000000 -0700 @@ -0,0 +1,13 @@ +#ifndef SQUID_OS_ANDROID_H +#define SQUID_OS_ANDROID_H + +#if defined(__ANDROID__) +/**************************************************************************** + *--------------------------------------------------------------------------* + * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...* + *--------------------------------------------------------------------------* + ****************************************************************************/ +#define _SQUID_ANDROID_ 1 + +#endif /* _SQUID_ANDROID_ */ +#endif /* SQUID_OS_ANDROID_H */ diff -u -r -N squid-3.4.4/compat/psignal.c squid-3.4.4.1/compat/psignal.c --- squid-3.4.4/compat/psignal.c 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/compat/psignal.c 2014-04-23 05:50:18.000000000 -0700 @@ -5,7 +5,7 @@ #include "squid.h" #include "psignal.h" -#if _SQUID_AIX_ || _SQUID_MINGW_ +#if _SQUID_AIX_ || _SQUID_ANDROID_ || _SQUID_MINGW_ extern const char* const sys_siglist[]; #define _sys_nsig 64 #define _sys_siglist sys_siglist diff -u -r -N squid-3.4.4/compat/xalloc.cc squid-3.4.4.1/compat/xalloc.cc --- squid-3.4.4/compat/xalloc.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/compat/xalloc.cc 2014-04-23 05:50:18.000000000 -0700 @@ -92,9 +92,6 @@ #if XMALLOC_STATISTICS malloc_stat(sz * n); #endif -#if XMALLOC_TRACE - xmalloc_show_trace(p, 1); -#endif #if MEM_GEN_TRACE if (tracefp) fprintf(tracefp, "c:%u:%u:%p\n", (unsigned int) n, (unsigned int) sz, p); @@ -133,9 +130,6 @@ #if XMALLOC_STATISTICS malloc_stat(sz); #endif -#if XMALLOC_TRACE - xmalloc_show_trace(p, 1); -#endif #if MEM_GEN_TRACE if (tracefp) fprintf(tracefp, "m:%d:%p\n", sz, p); @@ -149,9 +143,6 @@ xrealloc(void *s, size_t sz) { PROF_start(xrealloc); -#if XMALLOC_TRACE - xmalloc_show_trace(s, -1); -#endif if (sz < 1) sz = 1; @@ -182,9 +173,6 @@ #if XMALLOC_STATISTICS malloc_stat(sz); #endif -#if XMALLOC_TRACE - xmalloc_show_trace(p, 1); -#endif #if MEM_GEN_TRACE if (tracefp) /* new ptr, old ptr, new size */ fprintf(tracefp, "r:%p:%p:%d\n", p, s, sz); @@ -199,9 +187,6 @@ void *s = const_cast(s_const); PROF_start(free_const); -#if XMALLOC_TRACE - xmalloc_show_trace(s, -1); -#endif #if XMALLOC_DEBUG check_free(s); diff -u -r -N squid-3.4.4/configure squid-3.4.4.1/configure --- squid-3.4.4/configure 2014-03-09 01:42:04.000000000 -0800 +++ squid-3.4.4.1/configure 2014-04-23 05:51:46.000000000 -0700 @@ -1,14 +1,12 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.4.4. +# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.4.4.1. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -137,6 +135,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -170,7 +193,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -223,21 +247,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -575,8 +595,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.4.4' -PACKAGE_STRING='Squid Web Proxy 3.4.4' +PACKAGE_VERSION='3.4.4.1' +PACKAGE_STRING='Squid Web Proxy 3.4.4.1' PACKAGE_BUGREPORT='http://bugs.squid-cache.org/' PACKAGE_URL='' @@ -695,6 +715,7 @@ SSLLIB ENABLE_SSL_FALSE ENABLE_SSL_TRUE +NETTLELIB ENABLE_HTCP_FALSE ENABLE_HTCP_TRUE USE_SQUID_EUI_FALSE @@ -786,6 +807,9 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL +ac_ct_AR +DLLTOOL OBJDUMP NM ac_ct_DUMPBIN @@ -813,6 +837,7 @@ LN_S CPP RANLIB +HAVE_CXX11 EGREP GREP CXXCPP @@ -834,6 +859,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -850,6 +876,10 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -914,19 +944,19 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_arch_native enable_strict_error_checking enable_loadable_modules enable_shared -enable_shared enable_static with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock -with_gnu_ld with_included_ltdl with_ltdl_include with_ltdl_lib @@ -961,6 +991,7 @@ enable_cachemgr_hostname enable_eui enable_htcp +with_nettle enable_ssl with_openssl enable_forw_via_db @@ -1024,9 +1055,6 @@ CPPFLAGS CXX CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS CCC CXXCPP CPP @@ -1492,8 +1520,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1579,7 +1605,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 Squid Web Proxy 3.4.4 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.4.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1649,7 +1675,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.4.4:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.4.4.1:";; esac cat <<\_ACEOF @@ -1657,10 +1683,15 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-arch-native Some compilers offer CPU-specific optimizations with the -march=native parameter. This flag disables the optimization. The default is to auto-detect compiler @@ -1882,9 +1913,11 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-included-ltdl use the GNU ltdl sources included here --with-ltdl-include=DIR use the ltdl headers installed in DIR --with-ltdl-lib=DIR use the libltdl.la installed in DIR @@ -1905,6 +1938,7 @@ --without-aio Do not use POSIX AIO. Default: auto-detect --without-expat Do not use expat for ESI. Default: auto-detect --without-libxml2 Do not use libxml2 for ESI. Default: auto-detect + --without-nettle Compile without the Nettle crypto library. --with-openssl=PATH Compile with the OpenSSL libraries. The path to the OpenSSL development libraries and headers installation can be specified if outside of the @@ -2037,10 +2071,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.4.4 -generated by GNU Autoconf 2.68 +Squid Web Proxy configure 3.4.4.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2154,7 +2188,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2438,7 +2472,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2785,7 +2819,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2801,7 +2836,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2827,7 +2863,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2843,7 +2880,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2877,7 +2915,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -3028,7 +3067,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -3044,7 +3084,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -3101,7 +3142,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -3133,8 +3175,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 3.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by Squid Web Proxy $as_me 3.4.4.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3514,7 +3556,7 @@ -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3553,7 +3595,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3611,9 +3653,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3624,32 +3663,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3661,6 +3708,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3683,12 +3740,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -3700,10 +3757,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3722,7 +3779,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3762,7 +3819,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3813,7 +3870,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3842,12 +3899,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3866,7 +3917,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3930,6 +3981,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3952,7 +4042,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.4.4' + VERSION='3.4.4.1' cat >>confdefs.h <<_ACEOF @@ -3980,93 +4070,138 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + -AMTAR=${AMTAR-"${am_missing_run}tar"} +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 $as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -4074,6 +4209,49 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -4364,47 +4542,44 @@ # ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html +# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html # ============================================================================ # # SYNOPSIS # -# AX_CXX_COMPILE_STDCXX_0X +# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) # # DESCRIPTION # -# Check for baseline language coverage in the compiler for the C++0x -# standard. +# Check for baseline language coverage in the compiler for the C++11 +# standard; if necessary, add switches to CXXFLAGS to enable support. +# +# The first argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The second argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline C++11 support is required and that the macro +# should error out if no mode with that support is found. If specified +# 'optional', then configuration proceeds regardless, after defining +# HAVE_CXX11 if and only if a supporting mode is found. # # LICENSE # # Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014 Alexey Sokolov # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 7 +#serial 4 + -# This is what autoupdate's m4 run will expand. It fires -# the warning (with _au_warn_XXX), outputs it into the -# updated configure.ac (with AC_DIAGNOSE), and then outputs -# the replacement expansion. - - -# This is an auxiliary macro that is also run when -# autoupdate runs m4. It simply calls m4_warning, but -# we need a wrapper so that each warning is emitted only -# once. We break the quoting in m4_warning's argument in -# order to expand this macro's arguments, not AU_DEFUN's. - - -# Finally, this is the expansion that is picked up by -# autoconf. It tells the user to run autoupdate, and -# then outputs the replacement expansion. We do not care -# about autoupdate's warning because that contains -# information on what to do *after* running autoupdate. @@ -4447,7 +4622,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4487,7 +4662,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4540,7 +4715,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4581,7 +4756,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4639,7 +4814,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4683,7 +4858,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5129,8 +5304,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5214,6 +5388,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -5233,7 +5466,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -5266,6 +5499,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -5288,8 +5522,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5323,16 +5558,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5341,16 +5576,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5404,131 +5639,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -5558,7 +5668,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5602,7 +5712,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5798,8 +5908,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5833,16 +5944,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5851,16 +5962,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -6229,7 +6340,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -6295,7 +6406,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6502,8 +6613,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -6535,76 +6646,26 @@ fi -# Check for C++0x compiler support - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features without additional flags" >&5 -$as_echo_n "checking if g++ supports C++0x features without additional flags... " >&6; } -if ${ax_cv_cxx_compile_cxx0x_native+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = static_cast(c); -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxx_compile_cxx0x_native=yes -else - ax_cv_cxx_compile_cxx0x_native=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Check for C++11 compiler support +if test "x$squid_host_os" != "xmingw" ; then + #BUG 3613: when clang -std=c++0x is used, it activates a "strict mode" + # in the system libraries, which makes some c99 methods unavailable + # (e.g. strtoll), yet configure detects them as avilable. + case "$CXX" in + *clang++*) ;; #do nothing + *) + ax_cxx_compile_cxx11_required=false ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_native" >&5 -$as_echo "$ax_cv_cxx_compile_cxx0x_native" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=c++0x" >&5 -$as_echo_n "checking if g++ supports C++0x features with -std=c++0x... " >&6; } -if ${ax_cv_cxx_compile_cxx0x_cxx+:} false; then : + ac_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } +if ${ax_cv_cxx_compile_cxx11+:} false; then : $as_echo_n "(cached) " >&6 else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++0x" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6614,6 +6675,13 @@ static_assert(sizeof(int) <= sizeof(T), "not big enough"); }; + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + typedef check> right_angle_brackets; int a; @@ -6622,47 +6690,37 @@ typedef check check_type; check_type c; check_type&& cr = static_cast(c); -int -main () -{ - ; - return 0; -} + auto d = a; + auto l = [](){}; + _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxx_compile_cxx0x_cxx=yes + ax_cv_cxx_compile_cxx11=yes else - ax_cv_cxx_compile_cxx0x_cxx=no + ax_cv_cxx_compile_cxx11=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$ac_save_CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_cxx" >&5 -$as_echo "$ax_cv_cxx_compile_cxx0x_cxx" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=gnu++0x" >&5 -$as_echo_n "checking if g++ supports C++0x features with -std=gnu++0x... " >&6; } -if ${ax_cv_cxx_compile_cxx0x_gxx+:} false; then : + if test x$ac_success = xno; then + for switch in -std=c++11 -std=c++0x; do + cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval \${$cachevar+:} false; then : $as_echo_n "(cached) " >&6 else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=gnu++0x" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CXXFLAGS="$CXXFLAGS $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ template @@ -6671,6 +6729,13 @@ static_assert(sizeof(int) <= sizeof(T), "not big enough"); }; + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + typedef check> right_angle_brackets; int a; @@ -6679,48 +6744,54 @@ typedef check check_type; check_type c; check_type&& cr = static_cast(c); -int -main () -{ - ; - return 0; -} + auto d = a; + auto l = [](){}; + _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_cxx_compile_cxx0x_gxx=yes + eval $cachevar=yes else - ax_cv_cxx_compile_cxx0x_gxx=no + eval $cachevar=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$ac_save_CXXFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" +fi +eval ac_res=\$$cachevar + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test x\$$cachevar = xyes; then + CXXFLAGS="$CXXFLAGS $switch" + ac_success=yes + break + fi + done + fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5 + fi + else + if test x$ac_success = xno; then + HAVE_CXX11=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + else + HAVE_CXX11=1 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_gxx" >&5 -$as_echo "$ax_cv_cxx_compile_cxx0x_gxx" >&6; } +$as_echo "#define HAVE_CXX11 1" >>confdefs.h - if test "$ax_cv_cxx_compile_cxx0x_native" = yes || - test "$ax_cv_cxx_compile_cxx0x_cxx" = yes || - test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then + fi -$as_echo "#define HAVE_STDCXX_0X /**/" >>confdefs.h fi -if test "x$ax_cv_cxx_compile_cxx0x_cxx" = "xyes" -a \ - "x$squid_host_os" != "xmingw" ; then - #BUG 3613: when clang -std=c++0x is used, it activates a "strict mode" - # in the system libraries, which makes some c99 methods unavailable - # (e.g. strtoll), yet configure detects them as avilable. - case "$CXX" in - *clang++*) ;; #do nothing - *) CXXFLAGS="$CXXFLAGS -std=c++0x" ;; esac fi @@ -6742,7 +6813,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6782,7 +6853,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6985,7 +7056,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -7052,7 +7123,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7093,7 +7164,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FALSE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7134,7 +7205,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_TRUE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7175,7 +7246,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7216,7 +7287,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7257,7 +7328,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7298,7 +7369,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7339,7 +7410,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7380,7 +7451,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7421,7 +7492,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CPPUNITCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7464,7 +7535,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7511,7 +7582,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7554,7 +7625,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7708,8 +7779,8 @@ -macro_version='2.2.10' -macro_revision='1.3175' +macro_version='2.4.2' +macro_revision='1.3337' @@ -7749,7 +7820,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -7816,7 +7887,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -7895,7 +7966,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -8151,7 +8222,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8195,7 +8266,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8342,6 +8413,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -8368,7 +8444,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$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 @@ -8381,7 +8458,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -8424,8 +8501,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -8474,6 +8551,80 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : @@ -8490,6 +8641,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -8524,7 +8680,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8564,7 +8720,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8690,10 +8846,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -8731,12 +8883,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -8813,6 +8965,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -8828,9 +8995,162 @@ + + + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : @@ -8845,8 +9165,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -8866,11 +9186,15 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : @@ -8885,8 +9209,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -8905,6 +9229,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -8916,17 +9244,73 @@ esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + @@ -8950,7 +9334,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8990,7 +9374,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9049,7 +9433,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9089,7 +9473,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9139,13 +9523,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -9267,8 +9651,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -9292,6 +9676,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -9304,6 +9689,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -9345,6 +9731,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -9356,7 +9754,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -9382,8 +9780,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -9393,8 +9791,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -9431,6 +9829,18 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + @@ -9452,6 +9862,43 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : @@ -9519,7 +9966,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -9535,9 +9982,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -9556,7 +10013,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -9619,7 +10079,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -9630,7 +10090,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -9646,6 +10119,123 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) @@ -9666,7 +10256,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9706,7 +10296,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9758,7 +10348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9798,7 +10388,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9850,7 +10440,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9890,7 +10480,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9942,7 +10532,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9982,7 +10572,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10034,7 +10624,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10074,7 +10664,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10153,7 +10743,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -10164,6 +10760,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -10196,6 +10793,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -10217,7 +10815,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -10272,9 +10872,19 @@ #define HAVE_DLFCN_H 1 _ACEOF -fi +fi + +done + + -done +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf @@ -10324,7 +10934,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -10402,6 +11027,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -10758,8 +11387,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -10859,7 +11486,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -10903,7 +11532,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10924,6 +11553,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -10944,18 +11579,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -11043,13 +11693,17 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -11110,6 +11764,11 @@ + + + + + # # Check to make sure the static flag actually works. # @@ -11308,7 +11967,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -11352,6 +12010,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -11460,7 +12121,8 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -11508,7 +12170,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -11557,8 +12219,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -11573,13 +12234,13 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -11597,8 +12258,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11644,8 +12305,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11750,6 +12411,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -11775,7 +12437,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11788,22 +12456,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -11815,7 +12490,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11828,22 +12509,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -11888,20 +12576,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=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. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # 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. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=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. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -11913,6 +12645,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -11941,10 +12674,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=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 @@ -11957,7 +12686,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11966,7 +12695,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -11974,7 +12703,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$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 @@ -11990,13 +12719,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -12014,10 +12742,10 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -12096,23 +12824,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -12124,7 +12865,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12197,7 +12938,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' @@ -12216,9 +12957,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -12607,11 +13348,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -12701,7 +13437,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -12710,7 +13446,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -12775,7 +13511,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -12794,8 +13530,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -12828,13 +13565,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -12855,7 +13650,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -12863,10 +13658,6 @@ 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. @@ -12874,7 +13665,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12892,7 +13683,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12911,18 +13702,8 @@ 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 - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -12983,7 +13764,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -12999,7 +13780,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -13036,9 +13817,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13101,6 +13882,18 @@ 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 @@ -13120,7 +13913,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -13189,7 +13982,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13214,7 +14007,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -13238,7 +14031,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -13269,7 +14062,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13279,7 +14072,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -13770,10 +14563,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -13876,10 +14669,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -14204,7 +14997,6 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -14271,6 +15063,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -14288,6 +15081,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -14427,8 +15221,8 @@ # 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 - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -14570,7 +15364,13 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14583,22 +15383,29 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`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 "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -14611,7 +15418,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14624,22 +15437,29 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`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 "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -14682,29 +15502,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$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... - archive_expsym_cmds_CXX='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 - ld_shlibs_CXX=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # 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. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$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... + archive_expsym_cmds_CXX='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 + ld_shlibs_CXX=no + fi + ;; + esac + ;; darwin* | rhapsody*) @@ -14714,6 +15580,7 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -14758,7 +15625,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -14774,9 +15641,6 @@ ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -14810,7 +15674,7 @@ ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$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' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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 ld_shlibs_CXX=no @@ -14881,10 +15745,10 @@ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -14925,9 +15789,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -14938,7 +15802,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -15205,7 +16069,7 @@ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -15292,9 +16156,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='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' + $CC -shared $pic_flag -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 @@ -15429,6 +16293,14 @@ }; _LT_EOF + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15442,7 +16314,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -15451,13 +16323,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -15477,8 +16358,10 @@ postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -15514,6 +16397,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken case $host_os in @@ -15614,8 +16498,6 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -15719,6 +16601,11 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # 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). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; dgux*) case $cc_basename in ec++*) @@ -15775,7 +16662,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15839,7 +16726,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -15936,10 +16823,17 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. @@ -15997,6 +16891,8 @@ + + # # Check to make sure the static flag actually works. # @@ -16174,6 +17070,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. @@ -16188,15 +17085,25 @@ ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } @@ -16339,8 +17246,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -16366,7 +17271,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -16375,7 +17280,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -16440,7 +17345,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -16459,8 +17364,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -16492,13 +17398,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -16518,7 +17482,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -16526,10 +17490,6 @@ 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. @@ -16537,7 +17497,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -16555,7 +17515,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -16574,18 +17534,8 @@ 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 - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -16646,7 +17596,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -16662,7 +17612,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -16699,9 +17649,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -16764,6 +17714,18 @@ 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 @@ -16783,7 +17745,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -16852,7 +17814,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -16877,7 +17839,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -16901,7 +17863,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -16932,7 +17894,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -16942,7 +17904,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -17052,6 +18014,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -17080,6 +18043,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -17104,6 +18069,8 @@ module=yes eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_shlibext" >&5 @@ -17115,6 +18082,13 @@ _ACEOF fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + +cat >>confdefs.h <<_ACEOF +#define LT_SHARED_EXT "$libltdl_cv_shrext" +_ACEOF + +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variable specifies run-time module search path" >&5 $as_echo_n "checking which variable specifies run-time module search path... " >&6; } @@ -17585,10 +18559,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -17697,7 +18671,7 @@ # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@ -17836,7 +18810,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_argz_works" >&5 $as_echo "$lt_cv_sys_argz_works" >&6; } - if test $lt_cv_sys_argz_works = yes; then : + if test "$lt_cv_sys_argz_works" = yes; then : $as_echo "#define HAVE_WORKING_ARGZ 1" >>confdefs.h @@ -18145,8 +19119,16 @@ _ACEOF +name= +eval "lt_libprefix=\"$libname_spec\"" + +cat >>confdefs.h <<_ACEOF +#define LT_LIBPREFIX "$lt_libprefix" +_ACEOF + + name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +eval "LTDLOPEN=\"$libname_spec\"" @@ -18708,7 +19690,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_WIN32_PSAPI="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18938,7 +19920,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BZR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19127,7 +20109,6 @@ - # Check whether --enable-xmalloc-statistics was given. if test "${enable_xmalloc_statistics+set}" = set; then : enableval=$enable_xmalloc_statistics; @@ -20487,7 +21468,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20530,7 +21511,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21040,6 +22021,87 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: HTCP support enabled: $enable_htcp" >&5 $as_echo "$as_me: HTCP support enabled: $enable_htcp" >&6;} +# Cryptograhic libraries + +# Check whether --with-nettle was given. +if test "${with_nettle+set}" = set; then : + withval=$with_nettle; +case "$with_nettle" in + yes|no) + : # Nothing special to do here + ;; + *) + if test ! -d "$withval" ; then + as_fn_error $? "--with-nettle path does not point to a directory" "$LINENO" 5 + fi + NETTLELIBDIR="-L$with_nettle/lib" + CPPFLAGS="-I$with_nettle/include $CPPFLAGS" + with_nettle=yes + esac + +fi + +if test "x$with_nettle" != "xno" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle_md5_init in -lnettle" >&5 +$as_echo_n "checking for nettle_md5_init in -lnettle... " >&6; } +if ${ac_cv_lib_nettle_nettle_md5_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnettle $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nettle_md5_init (); +int +main () +{ +return nettle_md5_init (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_nettle_nettle_md5_init=yes +else + ac_cv_lib_nettle_nettle_md5_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_md5_init" >&5 +$as_echo "$ac_cv_lib_nettle_nettle_md5_init" >&6; } +if test "x$ac_cv_lib_nettle_nettle_md5_init" = xyes; then : + + NETTLELIB="$NETTLELIBDIR -lnettle" + for ac_header in nettle/md5.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "nettle/md5.h" "ac_cv_header_nettle_md5_h" "$ac_includes_default" +if test "x$ac_cv_header_nettle_md5_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETTLE_MD5_H 1 +_ACEOF + +fi + +done + + +else + with_nettle=no +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: Using Nettle cryptographic library: ${with_nettle:=yes}" >&5 +$as_echo "$as_me: Using Nettle cryptographic library: ${with_nettle:=yes}" >&6;} + # SSL is not enabled by default. # Default is to use OpenSSL when available @@ -21113,24 +22175,10 @@ unset squid_tmp_define -{ $as_echo "$as_me:${as_lineno-$LINENO}: Using OpenSSL MD5 implementation: ${with_openssl:=no}" >&5 -$as_echo "$as_me: Using OpenSSL MD5 implementation: ${with_openssl:=no}" >&6;} - -squid_tmp_define="" -case "${with_openssl}" in - yes|true|1) squid_tmp_define="1" ;; - no|false|0|"") squid_tmp_define="0" ;; - *) as_fn_error $? "SQUID_DEFINE_BOOL: unrecognized value for USE_OPENSSL: '${with_openssl}'" "$LINENO" 5 ;; -esac - -cat >>confdefs.h <<_ACEOF -#define USE_OPENSSL $squid_tmp_define -_ACEOF - -unset squid_tmp_define - +{ $as_echo "$as_me:${as_lineno-$LINENO}: Using OpenSSL library: ${with_openssl:=no}" >&5 +$as_echo "$as_me: Using OpenSSL library: ${with_openssl:=no}" >&6;} if test "x$enable_ssl" = "xyes"; then - if test "x$SSLLIB" = "x"; then + if test "x$SSLLIB" = "x" -a "x$with_nettle" = "xno"; then SSLLIB="-lcrypto" # for MD5 routines fi # This is a workaround for RedHat 9 brain damage.. @@ -22993,7 +24041,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SMBCLIENT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23577,7 +24625,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_krb5_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23618,7 +24666,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_krb5_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23657,7 +24705,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_krb5_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -25294,7 +26342,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_WBINFO="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26421,11 +27469,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -26442,8 +27490,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -26459,10 +27508,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -27721,23 +28770,20 @@ /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -30573,7 +31619,6 @@ res_init \ __res_init \ rint \ - sbrk \ sched_getaffinity \ sched_setaffinity \ select \ @@ -30945,6 +31990,9 @@ #if HAVE_WINSOCK2_H #include #endif + #if HAVE_SYS_UIO_H + #include + #endif " if test "x$ac_cv_type_struct_iovec" = xyes; then : @@ -32245,7 +33293,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PO2HTML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -32337,7 +33385,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PO2TEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -32560,6 +33608,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -33064,16 +34120,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -33133,28 +34189,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -33175,8 +34219,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 3.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by Squid Web Proxy $as_me 3.4.4.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -33241,11 +34285,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Squid Web Proxy config.status 3.4.4 -configured by $0, generated by GNU Autoconf 2.68, +Squid Web Proxy config.status 3.4.4.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -33336,7 +34380,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -33378,6 +34422,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -33398,13 +34443,20 @@ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -33419,14 +34471,17 @@ lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -33450,7 +34505,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -33459,12 +34513,12 @@ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -33503,8 +34557,8 @@ compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' @@ -33522,7 +34576,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -33531,12 +34584,12 @@ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' @@ -33561,6 +34614,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -33574,8 +34628,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -33585,12 +34644,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -33604,9 +34665,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -33628,8 +34687,8 @@ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ @@ -33639,9 +34698,7 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ @@ -33675,6 +34732,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -33689,7 +34747,8 @@ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ -prelink_cmds_CXX; do +prelink_cmds_CXX \ +postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -34423,7 +35482,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -34436,7 +35495,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -34470,21 +35529,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -34538,8 +35595,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -34593,6 +35650,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -34642,19 +35702,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP # 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". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -34684,6 +35767,12 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -34693,6 +35782,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -34807,12 +35899,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -34862,10 +35954,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# 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_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -34899,9 +35987,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# 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=$always_export_symbols @@ -34917,6 +36002,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -34963,210 +36051,169 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -35194,12 +36241,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic_CXX +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX @@ -35249,10 +36296,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# 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_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -35286,9 +36329,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -35304,6 +36344,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX diff -u -r -N squid-3.4.4/configure.ac squid-3.4.4.1/configure.ac --- squid-3.4.4/configure.ac 2014-03-09 01:42:04.000000000 -0800 +++ squid-3.4.4.1/configure.ac 2014-04-23 05:51:46.000000000 -0700 @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.4.4],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.4.4.1],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) @@ -16,7 +16,7 @@ m4_include([acinclude/pam.m4]) m4_include([acinclude/pkg.m4]) m4_include([acinclude/lib-checks.m4]) -m4_include([acinclude/ax_cxx_compile_stdcxx_0x.m4]) +m4_include([acinclude/ax_cxx_compile_stdcxx_11.m4]) m4_include([acinclude/ax_cxx_0x_types.m4]) PRESET_CFLAGS="$CFLAGS" @@ -82,16 +82,15 @@ AC_USE_SYSTEM_EXTENSIONS fi -# Check for C++0x compiler support -AX_CXX_COMPILE_STDCXX_0X -if test "x$ax_cv_cxx_compile_cxx0x_cxx" = "xyes" -a \ - "x$squid_host_os" != "xmingw" ; then +# Check for C++11 compiler support +if test "x$squid_host_os" != "xmingw" ; then #BUG 3613: when clang -std=c++0x is used, it activates a "strict mode" # in the system libraries, which makes some c99 methods unavailable # (e.g. strtoll), yet configure detects them as avilable. case "$CXX" in *clang++*) ;; #do nothing - *) CXXFLAGS="$CXXFLAGS -std=c++0x" ;; + *) + AX_CXX_COMPILE_STDCXX_11([noext],[optional]) esac fi @@ -459,18 +458,6 @@ dnl fi dnl ]) -dnl This is a developer only option.. developers know how to set defines -dnl -dnl AC_ARG_ENABLE(xmalloc-debug-trace, -dnl [ --enable-xmalloc-debug-trace -dnl Detailed trace of memory allocations], -dnl [ if test "$enableval" = "yes" ; then -dnl AC_MSG_NOTICE([malloc debug trace enabled]) -dnl AC_DEFINE(XMALLOC_TRACE,1,[Define to have a detailed trace of memory allocations]) -dnl AC_DEFINE(XMALLOC_DEBUG,1) -dnl fi -dnl ]) - AH_TEMPLATE(XMALLOC_STATISTICS,[Define to have malloc statistics]) AC_ARG_ENABLE(xmalloc-statistics, AS_HELP_STRING([--enable-xmalloc-statistics], @@ -1228,6 +1215,30 @@ AM_CONDITIONAL(ENABLE_HTCP, [test "x$enable_htcp" = "xyes"]) AC_MSG_NOTICE([HTCP support enabled: $enable_htcp]) +# Cryptograhic libraries +AC_ARG_WITH(nettle, + AS_HELP_STRING([--without-nettle],[Compile without the Nettle crypto library.]),[ +case "$with_nettle" in + yes|no) + : # Nothing special to do here + ;; + *) + if test ! -d "$withval" ; then + AC_MSG_ERROR([--with-nettle path does not point to a directory]) + fi + NETTLELIBDIR="-L$with_nettle/lib" + CPPFLAGS="-I$with_nettle/include $CPPFLAGS" + with_nettle=yes + esac +]) +if test "x$with_nettle" != "xno" ; then + AC_CHECK_LIB(nettle, nettle_md5_init,[ + NETTLELIB="$NETTLELIBDIR -lnettle" + AC_CHECK_HEADERS(nettle/md5.h) + ],[with_nettle=no]) +fi +AC_MSG_NOTICE([Using Nettle cryptographic library: ${with_nettle:=yes}]) +AC_SUBST(NETTLELIB) # SSL is not enabled by default. # Default is to use OpenSSL when available @@ -1277,11 +1288,9 @@ ]) SQUID_DEFINE_BOOL(USE_SSL,$enable_ssl, [Define this to include code for SSL gatewaying support]) -AC_MSG_NOTICE([Using OpenSSL MD5 implementation: ${with_openssl:=no}]) -SQUID_DEFINE_BOOL(USE_OPENSSL,${with_openssl}, - [Define this to make use of the OpenSSL libraries for MD5 calculation rather than Squid-supplied MD5 implementation or if building with SSL encryption]) +AC_MSG_NOTICE([Using OpenSSL library: ${with_openssl:=no}]) if test "x$enable_ssl" = "xyes"; then - if test "x$SSLLIB" = "x"; then + if test "x$SSLLIB" = "x" -a "x$with_nettle" = "xno"; then SSLLIB="-lcrypto" # for MD5 routines fi # This is a workaround for RedHat 9 brain damage.. @@ -3095,7 +3104,6 @@ res_init \ __res_init \ rint \ - sbrk \ sched_getaffinity \ sched_setaffinity \ select \ @@ -3209,6 +3217,9 @@ #if HAVE_WINSOCK2_H #include #endif + #if HAVE_SYS_UIO_H + #include + #endif ]) AC_CHECK_TYPE(struct msghdr,AC_DEFINE(HAVE_MSGHDR,1,[The system provides struct msghdr]),,[ diff -u -r -N squid-3.4.4/contrib/Makefile.in squid-3.4.4.1/contrib/Makefile.in --- squid-3.4.4/contrib/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/contrib/Makefile.in 2014-04-23 05:50:59.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,51 @@ # using a SVR4-based startup mechanism/file system layout # VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,7 +83,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -103,13 +147,32 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -148,6 +211,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -165,6 +229,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -202,11 +267,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -265,6 +332,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -378,11 +446,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -428,10 +496,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -512,15 +585,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am all: diff -u -r -N squid-3.4.4/doc/Makefile.in squid-3.4.4.1/doc/Makefile.in --- squid-3.4.4/doc/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/doc/Makefile.in 2014-04-23 05:51:00.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -145,6 +227,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -183,6 +266,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -200,6 +284,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -237,11 +322,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -300,6 +387,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -402,22 +490,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -432,57 +523,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -498,12 +544,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -515,15 +556,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -532,6 +569,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -568,13 +620,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -609,10 +658,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -690,22 +744,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/doc/manuals/Makefile.in squid-3.4.4.1/doc/manuals/Makefile.in --- squid-3.4.4/doc/manuals/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/doc/manuals/Makefile.in 2014-04-23 05:51:00.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,8 +77,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/language.list +DIST_COMMON = $(srcdir)/language.list $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = doc/manuals ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ @@ -44,7 +88,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -99,13 +143,32 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -144,6 +207,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -161,6 +225,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -198,11 +263,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -261,6 +328,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -356,6 +424,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/language.list: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -371,11 +440,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -422,10 +491,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -506,15 +580,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/errors/af/ERR_ACCESS_DENIED squid-3.4.4.1/errors/af/ERR_ACCESS_DENIED --- squid-3.4.4/errors/af/ERR_ACCESS_DENIED 2014-03-09 01:44:01.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Toegang geweier.

Die opstelling van toegangsbeheer keer dat u navraag nou toegelaat kan word. Kontak gerus u diensverskaffer indien u voel dit is verkeerd.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:44:01.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Tydkwota oorskry.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/af/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/af/ERR_AGENT_CONFIGURE 2014-03-09 01:44:02.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Webblaaier se opstelling

FOUT

Web Browser Configuration

Die opstelling van u webblaaier moet reggestel word om hierdie netwerk te gebruik.

Hoe om hierdie instellings in die blaaier te vind:

Vir Firefox-blaaiers, gaan na:
  • Nutsgoed -> Opsies -> Gevorderd -> Netwerk -> Verbinding
  • In the HTTP proxy box type the proxy name %h and port %b.
Vir Internet Explorer-blaaiers, gaan na:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
Vir Opera-blaaiers, gaan na:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_AGENT_WPAD squid-3.4.4.1/errors/af/ERR_AGENT_WPAD --- squid-3.4.4/errors/af/ERR_AGENT_WPAD 2014-03-09 01:44:02.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Webblaaier se opstelling

FOUT

Web Browser Configuration

Die opstelling van u webblaaier moet reggestel word om hierdie netwerk te gebruik.

Hoe om hierdie instellings in die blaaier te vind:

Vir Firefox-blaaiers, gaan na:
  • Nutsgoed -> Opsies -> Gevorderd -> Netwerk -> Verbinding
  • Kies "Outospeur instaanopstelling vir hierdie netwerk"
Vir Internet Explorer-blaaiers, gaan na:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
Vir Opera-blaaiers, gaan na:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/af/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/af/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:44:03.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Cache Access Denied

ERROR

Cache Toegang geweier.

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Toegang tot kasgeheue geweier.

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/af/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/af/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:44:03.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Cache Manager Access Denied

ERROR

Cache Manager Toegang geweier.

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Toegang tot kasbestuur geweier.

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/af/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/af/ERR_CANNOT_FORWARD 2014-03-09 01:44:04.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Kan nie dié versoek nou aanstuur nie

This request could not be forwarded to the origin server or to any parent caches.

Enkele moontlike probleme is:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_CONFLICT_HOST squid-3.4.4.1/errors/af/ERR_CONFLICT_HOST --- squid-3.4.4/errors/af/ERR_CONFLICT_HOST 2014-03-09 01:44:04.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Enkele moontlike probleme is:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_CONNECT_FAIL squid-3.4.4.1/errors/af/ERR_CONNECT_FAIL --- squid-3.4.4/errors/af/ERR_CONNECT_FAIL 2014-03-09 01:44:05.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Verbinding na %I het misluk

Die stelsel het die volgende teruggestuur: %E

Die afgeleë gasheer of netwerk is dalk af. Probeer die navraag gerus weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_DIR_LISTING squid-3.4.4.1/errors/af/ERR_DIR_LISTING --- squid-3.4.4/errors/af/ERR_DIR_LISTING 2014-03-09 01:44:05.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Gids: %U

Gids: %U/

Gidsinhoud:

%z
%g
Ouergids (Wortelgids)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_DNS_FAIL squid-3.4.4.1/errors/af/ERR_DNS_FAIL --- squid-3.4.4/errors/af/ERR_DNS_FAIL 2014-03-09 01:44:06.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Kan nie IP-adres vanaf gasheernaam %H bepaal nie

Die DNS-bediener het geantwoord:

%z

Dit beteken dat die kasbediener nie in staat was om die gasheernaam in die URL op te los nie. Kyk of die adres korrek is.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_ESI squid-3.4.4.1/errors/af/ERR_ESI --- squid-3.4.4/errors/af/ERR_ESI 2014-03-09 01:44:06.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

ESI-verwerking het misluk.

Die ESI-verwerker het geantwoord:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

U webmeester is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/af/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/af/ERR_FORWARDING_DENIED 2014-03-09 01:44:07.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Aanstuur geweier.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_DISABLED squid-3.4.4.1/errors/af/ERR_FTP_DISABLED --- squid-3.4.4/errors/af/ERR_FTP_DISABLED 2014-03-09 01:44:08.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

FTP is gedeaktiveerd

Hierdie kasbediener ondersteun nie FTP nie.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_FAILURE squid-3.4.4.1/errors/af/ERR_FTP_FAILURE --- squid-3.4.4/errors/af/ERR_FTP_FAILURE 2014-03-09 01:44:08.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

'n FTP-protokolfout het voorgekom tydens verkryging van die URL: %U

Squid het die volgende FTP-opdrag gestuur:

%f

Die bediener het geantwoord met:

%F
%g

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/af/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/af/ERR_FTP_FORBIDDEN 2014-03-09 01:44:09.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

An FTP authentication failure occurred while trying to retrieve the URL: %U

Squid het die volgende FTP-opdrag gestuur:

%f

Die bediener het geantwoord met:

%F
%g

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/af/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/af/ERR_FTP_NOT_FOUND 2014-03-09 01:44:09.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende URL kon nie opgespoor word nie: %U

Squid het die volgende FTP-opdrag gestuur:

%f

Die bediener het geantwoord met:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/af/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/af/ERR_FTP_PUT_CREATED 2014-03-09 01:44:10.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT suksesvol.

Bewerking suksesvol

Lêer is geskep


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/af/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/af/ERR_FTP_PUT_ERROR 2014-03-09 01:44:10.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: FTP upload failed

ERROR

FTP PUT-oplaai het misluk

'n FTP-protokolfout het voorgekom tydens verkryging van die URL: %U

Squid het die volgende FTP-opdrag gestuur:

%f

Die bediener het geantwoord met:

%F

Dit beteken dat die FTP-bediener dalk nie toestemming of ruimte het om die lêer te stoor nie. Kontroleer die pad, toestemmings, skyfspasie en probeer weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/af/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/af/ERR_FTP_PUT_MODIFIED 2014-03-09 01:44:11.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT suksesvol.

Bewerking suksesvol

Lêer is opgedateer


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/af/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/af/ERR_FTP_UNAVAILABLE 2014-03-09 01:44:11.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die FTP-bediener was te besig om die URL te verkry: %U

Squid het die volgende FTP-opdrag gestuur:

%f

Die bediener het geantwoord met:

%F
%g

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/af/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/af/ERR_GATEWAY_FAILURE 2014-03-09 01:44:12.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_ICAP_FAILURE squid-3.4.4.1/errors/af/ERR_ICAP_FAILURE --- squid-3.4.4/errors/af/ERR_ICAP_FAILURE 2014-03-09 01:44:12.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

ICAP-protokolfout.

Die stelsel het die volgende teruggestuur: %E

Dit beteken dat een of ander aspek van die ICAP-kommunikasie misluk het.

Enkele moontlike probleme is:

  • Die ICAP-bediener is nie bereikbaar nie.

  • 'n Onwettige antwoord is ontvang vanaf die ICAP-bediener.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_INVALID_REQ squid-3.4.4.1/errors/af/ERR_INVALID_REQ --- squid-3.4.4/errors/af/ERR_INVALID_REQ 2014-03-09 01:44:13.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Ongeldige versoek-fout is teëgekom tydens verwerking van die navraag:

%R

Enkele moontlike probleme is:

  • Ontbrekende of onbekende navraagmetode.

  • Ontbrekende URL.

  • Ontbrekende HTTP-identifiseerder (HTTP/1.0)

  • Navraag is te groot.

  • "Content-Length" ontbreek vir POST- of PUT-navrae.

  • Ongeldige karakter in gasheernaam; onderstreep word nie toegelaat nie.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_INVALID_RESP squid-3.4.4.1/errors/af/ERR_INVALID_RESP --- squid-3.4.4/errors/af/ERR_INVALID_RESP 2014-03-09 01:44:13.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Ongeldige antwoord-fout is teëgekom tydens verwerking van die navraag:

%R

Die ontvangde HTTP-antwoordboodskap van die bediener wat gekontak is, kon nie verstaan word nie of was op 'n ander manier misvormd. Kontak die werfoperateur.

Die kasbediener se administrateur kan dalk meer detail verskaf oor die presiese aard van die probleem indien nodig.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_INVALID_URL squid-3.4.4.1/errors/af/ERR_INVALID_URL --- squid-3.4.4/errors/af/ERR_INVALID_URL 2014-03-09 01:44:14.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Ongeldige URL

'n Sekere aspek van die aangevraagde URL is verkeerd.

Enkele moontlike probleme is:

  • Ontbrekende of verkeerde toegangsprotokol (moet http:// of soortgelyk wees)

  • Ontbrekende gasheernaam

  • Illegal double-escape in the URL-Path

  • Ongeldige karakter in gasheernaam; onderstreep word nie toegelaat nie.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_LIFETIME_EXP squid-3.4.4.1/errors/af/ERR_LIFETIME_EXP --- squid-3.4.4/errors/af/ERR_LIFETIME_EXP 2014-03-09 01:44:15.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Verbinding se leeftyd het verstryk

Squid het die navraag afgesluit omdat dit die maksimumleeftyd vir 'n verbinding oorskry het.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_NO_RELAY squid-3.4.4.1/errors/af/ERR_NO_RELAY --- squid-3.4.4/errors/af/ERR_NO_RELAY 2014-03-09 01:44:15.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

No Wais Relay

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/af/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/af/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:44:16.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Geldige dokument is nie in die kas gevind nie, en only-if-cached is gespesifiseer.

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/error-details.txt squid-3.4.4.1/errors/af/error-details.txt --- squid-3.4.4/errors/af/error-details.txt 2014-03-09 01:44:23.000000000 -0800 +++ squid-3.4.4.1/errors/af/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/af/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/af/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/af/ERR_PRECONDITION_FAILED 2014-03-09 01:44:17.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_READ_ERROR squid-3.4.4.1/errors/af/ERR_READ_ERROR --- squid-3.4.4/errors/af/ERR_READ_ERROR 2014-03-09 01:44:17.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Leesfout

Die stelsel het die volgende teruggestuur: %E

'n Fouttoestand het voorgekom tydens lees van data van die netwerk. Probeer die versoek gerus weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_READ_TIMEOUT squid-3.4.4.1/errors/af/ERR_READ_TIMEOUT --- squid-3.4.4/errors/af/ERR_READ_TIMEOUT 2014-03-09 01:44:18.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Tyd verstreke tydens lees

Die stelsel het die volgende teruggestuur: %E

Die tyd het verstryk tydens die lees van data van die netwerk. Die netwerk of bediener is dalk af of verstop. Probeer die navraag gerus weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/af/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/af/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:44:18.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Kon nie 'n beveiligde verbinding skep na %I nie

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/af/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/af/ERR_SHUTTING_DOWN 2014-03-09 01:44:19.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Hierdie kasbediener skakel tans af en kan nie nou u navraag bedien nie. Probeer gerus u navraag weer binnekort.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/af/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/af/ERR_SOCKET_FAILURE 2014-03-09 01:44:19.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Sokfout

Die stelsel het die volgende teruggestuur: %E

Squid kan nie 'n TCP-sok skep nie, vermoedelik weens hoë lading. Probeer die navraag gerus weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_TOO_BIG squid-3.4.4.1/errors/af/ERR_TOO_BIG --- squid-3.4.4/errors/af/ERR_TOO_BIG 2014-03-09 01:44:20.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Die navraag of antwoord is te groot.

Indien u 'n POST- of PUT-navraag maak, is die item wat u probeer oplaai te groot.

Indien u 'n GET-navraag maak, is die item wat u probeer aflaai te groot.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/af/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/af/ERR_UNSUP_HTTPVERSION 2014-03-09 01:44:20.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

Niegesteunde HTTP-weergawe

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Unsupported HTTP version

Hierdie Squid aanvaar nie die HTTP-weergawe wat u probeer gebruik nie.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_UNSUP_REQ squid-3.4.4.1/errors/af/ERR_UNSUP_REQ --- squid-3.4.4/errors/af/ERR_UNSUP_REQ 2014-03-09 01:44:21.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Niegesteunde versoekmetode en -protokol

Squid ondersteun nie alle navraagmetodes vir alle toegangsprotokolle nie. Mens kan by voorbeeld nie 'n Gopher-navraag POST nie.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_URN_RESOLVE squid-3.4.4.1/errors/af/ERR_URN_RESOLVE --- squid-3.4.4/errors/af/ERR_URN_RESOLVE 2014-03-09 01:44:21.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: The requested URN could not be retrieved

ERROR

'n URL vir die aangevraagde URN kon nie verkry word nie

Die volgende fout is teëgekom tydens verkryging van die URN: %U

Kan nie URN oplos nie

Moet eerder nie te veel verwag van URN'e op %T nie :)

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_WRITE_ERROR squid-3.4.4.1/errors/af/ERR_WRITE_ERROR --- squid-3.4.4/errors/af/ERR_WRITE_ERROR 2014-03-09 01:44:22.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Skryffout

Die stelsel het die volgende teruggestuur: %E

'n Fouttoestand het voorgekom tydens skryf van data van die netwerk. Probeer die versoek gerus weer.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/af/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/af/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/af/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:44:23.000000000 -0800 +++ squid-3.4.4.1/errors/af/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Die aangevraagde URL kon nie verkry word nie

ERROR

The requested URL could not be retrieved

Die volgende fout is teëgekom tydens verkryging van die URL: %U

Antwoord het nul-lengte

Squid het geen data vir hierdie navraag ontvang nie.

Die kasbediener se administrateur is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ar/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ar/ERR_ACCESS_DENIED 2014-03-09 01:44:23.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Access Denied.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:44:24.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ar/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ar/ERR_AGENT_CONFIGURE 2014-03-09 01:44:24.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

خطأ

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_AGENT_WPAD squid-3.4.4.1/errors/ar/ERR_AGENT_WPAD --- squid-3.4.4/errors/ar/ERR_AGENT_WPAD 2014-03-09 01:44:25.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

خطأ

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ar/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ar/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:44:25.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: Cache Access Denied

ERROR

Cache Access Denied.

The following error was encountered while trying to retrieve the URL: %U

Cache Access Denied.

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:44:26.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: Cache Manager Access Denied

ERROR

Cache Manager Access Denied.

The following error was encountered while trying to retrieve the URL: %U

Cache Manager Access Denied.

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ar/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ar/ERR_CANNOT_FORWARD 2014-03-09 01:44:26.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unable to forward this request at this time.

This request could not be forwarded to the origin server or to any parent caches.

Some possible problems are:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ar/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ar/ERR_CONFLICT_HOST 2014-03-09 01:44:27.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Some possible problems are:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ar/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ar/ERR_CONNECT_FAIL 2014-03-09 01:44:27.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

The system returned: %E

The remote host or network may be down. Please try the request again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_DIR_LISTING squid-3.4.4.1/errors/ar/ERR_DIR_LISTING --- squid-3.4.4/errors/ar/ERR_DIR_LISTING 2014-03-09 01:44:28.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Directory Content:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_DNS_FAIL squid-3.4.4.1/errors/ar/ERR_DNS_FAIL --- squid-3.4.4/errors/ar/ERR_DNS_FAIL 2014-03-09 01:44:28.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unable to determine IP address from host name %H

The DNS server returned:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ESI squid-3.4.4.1/errors/ar/ERR_ESI --- squid-3.4.4/errors/ar/ERR_ESI 2014-03-09 01:44:29.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ar/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ar/ERR_FORWARDING_DENIED 2014-03-09 01:44:29.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Forwarding Denied.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_DISABLED squid-3.4.4.1/errors/ar/ERR_FTP_DISABLED --- squid-3.4.4/errors/ar/ERR_FTP_DISABLED 2014-03-09 01:44:30.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

FTP is Disabled

This cache does not support FTP.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_FAILURE squid-3.4.4.1/errors/ar/ERR_FTP_FAILURE --- squid-3.4.4/errors/ar/ERR_FTP_FAILURE 2014-03-09 01:44:31.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

An FTP protocol error occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ar/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ar/ERR_FTP_FORBIDDEN 2014-03-09 01:44:31.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

An FTP authentication failure occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ar/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ar/ERR_FTP_NOT_FOUND 2014-03-09 01:44:32.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following URL could not be retrieved: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ar/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ar/ERR_FTP_PUT_CREATED 2014-03-09 01:44:32.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operation successful

File created


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ar/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ar/ERR_FTP_PUT_ERROR 2014-03-09 01:44:33.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: FTP upload failed

ERROR

FTP PUT upload failed

An FTP protocol error occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ar/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ar/ERR_FTP_PUT_MODIFIED 2014-03-09 01:44:34.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operation successful

File updated


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ar/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ar/ERR_FTP_UNAVAILABLE 2014-03-09 01:44:34.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The FTP server was too busy to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ar/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ar/ERR_GATEWAY_FAILURE 2014-03-09 01:44:35.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ar/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ar/ERR_ICAP_FAILURE 2014-03-09 01:44:35.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ICAP protocol error.

The system returned: %E

This means that some aspect of the ICAP communication failed.

Some possible problems are:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_INVALID_REQ squid-3.4.4.1/errors/ar/ERR_INVALID_REQ --- squid-3.4.4/errors/ar/ERR_INVALID_REQ 2014-03-09 01:44:36.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Request error was encountered while trying to process the request:

%R

Some possible problems are:

  • Missing or unknown request method.

  • Missing URL.

  • Missing HTTP Identifier (HTTP/1.0).

  • Request is too large.

  • Content-Length missing for POST or PUT requests.

  • Illegal character in hostname; underscores are not allowed.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_INVALID_RESP squid-3.4.4.1/errors/ar/ERR_INVALID_RESP --- squid-3.4.4/errors/ar/ERR_INVALID_RESP 2014-03-09 01:44:36.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Response error was encountered while trying to process the request:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_INVALID_URL squid-3.4.4.1/errors/ar/ERR_INVALID_URL --- squid-3.4.4/errors/ar/ERR_INVALID_URL 2014-03-09 01:44:37.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

مسار غير صحيح

Some aspect of the requested URL is incorrect.

Some possible problems are:

  • Missing or incorrect access protocol (should be http:// or similar)

  • Missing hostname

  • Illegal double-escape in the URL-Path

  • Illegal character in hostname; underscores are not allowed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ar/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ar/ERR_LIFETIME_EXP 2014-03-09 01:44:37.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection Lifetime Expired

Squid has terminated the request because it has exceeded the maximum connection lifetime.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_NO_RELAY squid-3.4.4.1/errors/ar/ERR_NO_RELAY --- squid-3.4.4/errors/ar/ERR_NO_RELAY 2014-03-09 01:44:38.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

No Wais Relay

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ar/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ar/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:44:38.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Valid document was not found in the cache and only-if-cached directive was specified.

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/error-details.txt squid-3.4.4.1/errors/ar/error-details.txt --- squid-3.4.4/errors/ar/error-details.txt 2014-03-09 01:44:45.000000000 -0800 +++ squid-3.4.4.1/errors/ar/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ar/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ar/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ar/ERR_PRECONDITION_FAILED 2014-03-09 01:44:39.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_READ_ERROR squid-3.4.4.1/errors/ar/ERR_READ_ERROR --- squid-3.4.4/errors/ar/ERR_READ_ERROR 2014-03-09 01:44:39.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

خطأ قراءة

The system returned: %E

An error condition occurred while reading data from the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ar/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ar/ERR_READ_TIMEOUT 2014-03-09 01:44:40.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Read Timeout

The system returned: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ar/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ar/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:44:40.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ar/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ar/ERR_SHUTTING_DOWN 2014-03-09 01:44:41.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ar/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ar/ERR_SOCKET_FAILURE 2014-03-09 01:44:41.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Socket Failure

The system returned: %E

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_TOO_BIG squid-3.4.4.1/errors/ar/ERR_TOO_BIG --- squid-3.4.4/errors/ar/ERR_TOO_BIG 2014-03-09 01:44:42.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

The request or reply is too large.

If you are making a POST or PUT request, then the item you are trying to upload is too large.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ar/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ar/ERR_UNSUP_HTTPVERSION 2014-03-09 01:44:43.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_UNSUP_REQ squid-3.4.4.1/errors/ar/ERR_UNSUP_REQ --- squid-3.4.4/errors/ar/ERR_UNSUP_REQ 2014-03-09 01:44:43.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unsupported Request Method and Protocol

Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_URN_RESOLVE squid-3.4.4.1/errors/ar/ERR_URN_RESOLVE --- squid-3.4.4/errors/ar/ERR_URN_RESOLVE 2014-03-09 01:44:44.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URN could not be retrieved

ERROR

A URL for the requested URN could not be retrieved

The following error was encountered while trying to retrieve the URN: %U

Cannot Resolve URN

Hey, don't expect too much from URNs on %T :)

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_WRITE_ERROR squid-3.4.4.1/errors/ar/ERR_WRITE_ERROR --- squid-3.4.4/errors/ar/ERR_WRITE_ERROR 2014-03-09 01:44:44.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

خطأ كتابة

The system returned: %E

An error condition occurred while writing to the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ar/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ar/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ar/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:44:45.000000000 -0800 +++ squid-3.4.4.1/errors/ar/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطأ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Zero Sized Reply

Squid did not receive any data for this request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ACCESS_DENIED squid-3.4.4.1/errors/az/ERR_ACCESS_DENIED --- squid-3.4.4/errors/az/ERR_ACCESS_DENIED 2014-03-09 01:44:45.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Giriş qadağandır.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:44:46.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/az/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/az/ERR_AGENT_CONFIGURE 2014-03-09 01:44:46.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

SƏHV

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_AGENT_WPAD squid-3.4.4.1/errors/az/ERR_AGENT_WPAD --- squid-3.4.4/errors/az/ERR_AGENT_WPAD 2014-03-09 01:44:47.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

SƏHV

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/az/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/az/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:44:47.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Cache Access Denied

ERROR

Cache Giriş qadağandır.

The following error was encountered while trying to retrieve the URL: %U

Keşdən istifadə qadağandır

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/az/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/az/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:44:48.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Cache Manager Access Denied

ERROR

Cache Manager Giriş qadağandır.

The following error was encountered while trying to retrieve the URL: %U

Keş idarəetməsinə giriş qadağandır

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/az/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/az/ERR_CANNOT_FORWARD 2014-03-09 01:44:48.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Hal-hazırda sorğunuzu yönlədirmək mümkün deyildir.

This request could not be forwarded to the origin server or to any parent caches.

Mümkün probleml�^�rd�^�n b�^�zil�^�ri:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_CONFLICT_HOST squid-3.4.4.1/errors/az/ERR_CONFLICT_HOST --- squid-3.4.4/errors/az/ERR_CONFLICT_HOST 2014-03-09 01:44:49.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Mümkün probleml�^�rd�^�n b�^�zil�^�ri:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_CONNECT_FAIL squid-3.4.4.1/errors/az/ERR_CONNECT_FAIL --- squid-3.4.4/errors/az/ERR_CONNECT_FAIL 2014-03-09 01:44:49.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

Sistemdən gələn cavab: %E

The remote host or network may be down. Please try the request again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_DIR_LISTING squid-3.4.4.1/errors/az/ERR_DIR_LISTING --- squid-3.4.4/errors/az/ERR_DIR_LISTING 2014-03-09 01:44:50.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Direktoriyanın m�^�zmunu

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_DNS_FAIL squid-3.4.4.1/errors/az/ERR_DNS_FAIL --- squid-3.4.4/errors/az/ERR_DNS_FAIL 2014-03-09 01:44:51.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Uzaqda yerləşən kompyuterin İP adresini təyin mumkun olmadı %H

DNS serverin cavabı:

%z

Bu o deməkdir ki keş URL-də göstərilmiş serveri təyin edə bilmir. Adresin düzgün yazıldığını yoxlayın.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ESI squid-3.4.4.1/errors/az/ERR_ESI --- squid-3.4.4/errors/az/ERR_ESI 2014-03-09 01:44:51.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/az/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/az/ERR_FORWARDING_DENIED 2014-03-09 01:44:52.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Yönləndirmə qadağandır.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_DISABLED squid-3.4.4.1/errors/az/ERR_FTP_DISABLED --- squid-3.4.4/errors/az/ERR_FTP_DISABLED 2014-03-09 01:44:52.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

FTP protokolu qadağandır

Bu keş FTP protokolunu təmin etmir.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_FAILURE squid-3.4.4.1/errors/az/ERR_FTP_FAILURE --- squid-3.4.4/errors/az/ERR_FTP_FAILURE 2014-03-09 01:44:53.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

URL ilə əlaqə zamanı FTP protokolu uzrə aşağıdakı səhv baş vermişdir: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/az/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/az/ERR_FTP_FORBIDDEN 2014-03-09 01:44:53.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

URL ilə əlaqə zamanı FTP protokolu uzrə aşağıdakı səhv baş vermişdir: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/az/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/az/ERR_FTP_NOT_FOUND 2014-03-09 01:44:54.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following URL could not be retrieved: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/az/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/az/ERR_FTP_PUT_CREATED 2014-03-09 01:44:54.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Əməliyyat müvəfəqiyyətlə başa çatdı

Fayl yarandı


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/az/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/az/ERR_FTP_PUT_ERROR 2014-03-09 01:44:55.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: FTP upload failed

ERROR

FTP PUT upload failed

URL ilə əlaqə zamanı FTP protokolu uzrə aşağıdakı səhv baş vermişdir: %U

Squid sent the following FTP command:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/az/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/az/ERR_FTP_PUT_MODIFIED 2014-03-09 01:44:55.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Əməliyyat müvəfəqiyyətlə başa çatdı

Fayl yeniləndi


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/az/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/az/ERR_FTP_UNAVAILABLE 2014-03-09 01:44:56.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

URL ilə əlaqə zamanı FTP serverin həddən ziyadə yüklü olduğu məlum olub: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/az/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/az/ERR_GATEWAY_FAILURE 2014-03-09 01:44:56.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ICAP_FAILURE squid-3.4.4.1/errors/az/ERR_ICAP_FAILURE --- squid-3.4.4/errors/az/ERR_ICAP_FAILURE 2014-03-09 01:44:57.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

İCAP protokol s�^�hvi

Sistemdən gələn cavab: %E

This means that some aspect of the ICAP communication failed.

Mümkün probleml�^�rd�^�n b�^�zil�^�ri:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_INVALID_REQ squid-3.4.4.1/errors/az/ERR_INVALID_REQ --- squid-3.4.4/errors/az/ERR_INVALID_REQ 2014-03-09 01:44:57.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

Invalid Request error was encountered while trying to process the request:

%R

Mümkün probleml�^�rd�^�n b�^�zil�^�ri:

  • (GET, POST) sorğusunun metodu məlum deyil və ya umumiyyətlə yoxdur.

  • URL yoxdur.

  • HTTP identifikator yoxdur (HTTP/1.0).

  • Sorğu həddən ziyadə böyükdür.

  • POST və PUT sorğuları üçün Content-Length göstərilməmişdir

  • Server adında qadağan edilmiş simvol; altxətt yol verilməzdir.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_INVALID_RESP squid-3.4.4.1/errors/az/ERR_INVALID_RESP --- squid-3.4.4/errors/az/ERR_INVALID_RESP 2014-03-09 01:44:58.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

Invalid Response error was encountered while trying to process the request:

%R

Serverd�^�n gönd�^�rilmi�^� HTTP cavab mesajı s�^�hvdir v�^� ya s�^�hv formala�^�ıb. Xahi�^� edirik sayt operatoru il�^� �^�laq�^� saxlayın

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_INVALID_URL squid-3.4.4.1/errors/az/ERR_INVALID_URL --- squid-3.4.4/errors/az/ERR_INVALID_URL 2014-03-09 01:44:59.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Invalid URL

URL-nin bəzi aspektləri səhvdir.

Mümkün probleml�^�rd�^�n b�^�zil�^�ri:

  • Giriş protokol yoxdur və ya səhvdir (http:// və ya oxşar olmalıdır)

  • Server adı yoxdur

  • Illegal double-escape in the URL-Path

  • Server adında qadağan edilmiş simvol; altxətt yol verilməzdir.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_LIFETIME_EXP squid-3.4.4.1/errors/az/ERR_LIFETIME_EXP --- squid-3.4.4/errors/az/ERR_LIFETIME_EXP 2014-03-09 01:44:59.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Qoşulma müddəti bitdi

Squid has terminated the request because it has exceeded the maximum connection lifetime.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_NO_RELAY squid-3.4.4.1/errors/az/ERR_NO_RELAY --- squid-3.4.4/errors/az/ERR_NO_RELAY 2014-03-09 01:45:00.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Wais ötürücü təyin edilməmişdir

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/az/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/az/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:45:00.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Obyekt keşdə tapılmadı və only-if-cached əmri təyin olunmuşdur.

Siz only-if-cached əmri ilə sorğu göndərmisiniz. Obyekt keşdə tapılmadı, və ya only-if-cached əmri ilə qadağan olunmuş obyektin yenilənməsi tələb olunur.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/error-details.txt squid-3.4.4.1/errors/az/error-details.txt --- squid-3.4.4/errors/az/error-details.txt 2014-03-09 01:45:08.000000000 -0800 +++ squid-3.4.4.1/errors/az/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/az/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/az/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/az/ERR_PRECONDITION_FAILED 2014-03-09 01:45:01.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_READ_ERROR squid-3.4.4.1/errors/az/ERR_READ_ERROR --- squid-3.4.4/errors/az/ERR_READ_ERROR 2014-03-09 01:45:01.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Oxunma səhvi

Sistemdən gələn cavab: %E

An error condition occurred while reading data from the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_READ_TIMEOUT squid-3.4.4.1/errors/az/ERR_READ_TIMEOUT --- squid-3.4.4/errors/az/ERR_READ_TIMEOUT 2014-03-09 01:45:03.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gözləmə müddəti bitmişdir

Sistemdən gələn cavab: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/az/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/az/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:45:03.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/az/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/az/ERR_SHUTTING_DOWN 2014-03-09 01:45:04.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/az/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/az/ERR_SOCKET_FAILURE 2014-03-09 01:45:04.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Socket Failure

Sistemdən gələn cavab: %E

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_TOO_BIG squid-3.4.4.1/errors/az/ERR_TOO_BIG --- squid-3.4.4/errors/az/ERR_TOO_BIG 2014-03-09 01:45:05.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Sorğu və ya cavab həddən ziyadə böyükdür.

Əgər siz POST və ya PUT sorğusunu edirsinizsə, sizin göndərmək istədiniz fayl həddən ziyadə böyükdür.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/az/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/az/ERR_UNSUP_HTTPVERSION 2014-03-09 01:45:05.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_UNSUP_REQ squid-3.4.4.1/errors/az/ERR_UNSUP_REQ --- squid-3.4.4/errors/az/ERR_UNSUP_REQ 2014-03-09 01:45:06.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Dəstəklənməyən sorğu metodu və protokol

Squid bütün sorğu metodları və bütün protokollardəstəkləmir. Məsələn, Gopher protokolu üzrə siz POST sorğu metodunu yerinə yetirə bilməzsiniz.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_URN_RESOLVE squid-3.4.4.1/errors/az/ERR_URN_RESOLVE --- squid-3.4.4/errors/az/ERR_URN_RESOLVE 2014-03-09 01:45:07.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: The requested URN could not be retrieved

ERROR

Sorğulanan URN üçün URL ilə əlaqə yaradılmadı

The following error was encountered while trying to retrieve the URN: %U

URN tapılmadı

%T texnologiyasından çox şey gözləməyə dəyməz :)

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_WRITE_ERROR squid-3.4.4.1/errors/az/ERR_WRITE_ERROR --- squid-3.4.4/errors/az/ERR_WRITE_ERROR 2014-03-09 01:45:07.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Yazma səhvi

Sistemdən gələn cavab: %E

An error condition occurred while writing to the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/az/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/az/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/az/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:45:08.000000000 -0800 +++ squid-3.4.4.1/errors/az/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Sıfır Uzunluqlu Cavab

Squid bu sorğu üçün heç bir məlumat almadı.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ACCESS_DENIED squid-3.4.4.1/errors/bg/ERR_ACCESS_DENIED --- squid-3.4.4/errors/bg/ERR_ACCESS_DENIED 2014-03-09 01:45:09.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Отказан достъп

Конфигурацията за контрол на достъпа не позволява да бъде изпълнена Вашата заявка в този момент. Моля, ако считате, че това е неправилно, да се обърнете към Вашия Интернет доставчик.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:45:09.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

Тези ограничения са поставени от Интернет доставчика, който администрира този кеш сървър. Ако считате това за неправилно, моля обърнете се към администратора.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/bg/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/bg/ERR_AGENT_CONFIGURE 2014-03-09 01:45:10.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ГРЕШКА

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

Как да намерите тези настройки на Вашия браузер:

За браузер Firefox идете на:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
За браузер Internet Explorer идете на:
  • Инструменти -> Опции за интернет -> Връзки -> LAN настройки -> Прокси сървър
  • In the HTTP proxy box type the proxy name %h and port %b.
За браузер Opera идете на:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_AGENT_WPAD squid-3.4.4.1/errors/bg/ERR_AGENT_WPAD --- squid-3.4.4/errors/bg/ERR_AGENT_WPAD 2014-03-09 01:45:10.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ГРЕШКА

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

Как да намерите тези настройки на Вашия браузер:

За браузер Firefox идете на:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
За браузер Internet Explorer идете на:
  • Инструменти -> Опции за интернет -> Връзки -> LAN настройки -> Прокси сървър
  • Изберете Автоматично откриване на настройките.
За браузер Opera идете на:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Изберете Използване на Автоматично конфигуриране на прокси сървър.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/bg/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/bg/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:45:11.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Cache Access Denied

ERROR

Cache Отказан достъп

Възникна следната грешка при опит за достъп до: %U

Отказан достъп до кешираните данни.

Съжалявам, не Ви е позволен достъп до %U от този кеш докато не представите своето име и парола за достъп.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:45:11.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Cache Manager Access Denied

ERROR

Cache Manager Отказан достъп

Възникна следната грешка при опит за достъп до: %U

Отказан достъп до кеш мениджъра.

Съжалявам, не Ви е позволен достъп до %U от този кеш мениджър докато не представите своето име и парола за достъп.

Моля обърнете се към администратора ако имате проблем с достъпа или, ако сте администратора, прочетете документацията на Squid за кеш мениджър интерфейса и проверете логовете за по-подробни съобщения за грешката.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/bg/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/bg/ERR_CANNOT_FORWARD 2014-03-09 01:45:12.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Заявката не може да бъде пренасочена в този момент.

This request could not be forwarded to the origin server or to any parent caches.

Възможни грешки:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_CONFLICT_HOST squid-3.4.4.1/errors/bg/ERR_CONFLICT_HOST --- squid-3.4.4/errors/bg/ERR_CONFLICT_HOST 2014-03-09 01:45:12.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Възможни грешки:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_CONNECT_FAIL squid-3.4.4.1/errors/bg/ERR_CONNECT_FAIL --- squid-3.4.4/errors/bg/ERR_CONNECT_FAIL 2014-03-09 01:45:13.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Връзката до %I не може да бъде осъществена.

Операционната система даде следното съобщение: %E

Вероятно отдалеченият сървър или мрежа са недостъпни. Моля, опитайте отново да направите Вашата заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_DIR_LISTING squid-3.4.4.1/errors/bg/ERR_DIR_LISTING --- squid-3.4.4/errors/bg/ERR_DIR_LISTING 2014-03-09 01:45:14.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - директория: %U

директория: %U/

Съдържание на директорията:

%z
%g
Горна директория (Главна директория)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_DNS_FAIL squid-3.4.4.1/errors/bg/ERR_DNS_FAIL --- squid-3.4.4/errors/bg/ERR_DNS_FAIL 2014-03-09 01:45:14.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Не може да бъде намерен IP адресът на сървъра %H

Сървърът на имена върна следния отговор:

%z

Сървърът не може да бъде намерен. Проверете дали адресът е правилен.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ESI squid-3.4.4.1/errors/bg/ERR_ESI --- squid-3.4.4/errors/bg/ERR_ESI 2014-03-09 01:45:15.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Неуспешна обработка на ESI заявка.

Обработката на ESI заявката върна следния резултат:

%Z

ESI шаблонът не може да бъде обработен. Обърнете се към администратора на web сървъра

Вашият web администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/bg/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/bg/ERR_FORWARDING_DENIED 2014-03-09 01:45:15.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Пренасочването на заявката е отказано.

Този кеш сървър няма да пренасочи Вашата заявка, защото не е висшестоящ кеш сървър за клиента, от който идва заявката. Вероятно клиентът %i е неправилно конфигуриран кеш сървър.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_DISABLED squid-3.4.4.1/errors/bg/ERR_FTP_DISABLED --- squid-3.4.4/errors/bg/ERR_FTP_DISABLED 2014-03-09 01:45:16.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Протоколът FTP е забранен.

Този кеш сървър не поддържа FTP

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_FAILURE squid-3.4.4.1/errors/bg/ERR_FTP_FAILURE --- squid-3.4.4/errors/bg/ERR_FTP_FAILURE 2014-03-09 01:45:16.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна грешка на FTP протокола при опит за доставка на: %U

Кеш сървърът изпрати следната FTP команда:

%f

Сървърът даде следния отговор:

%F
%g

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/bg/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/bg/ERR_FTP_FORBIDDEN 2014-03-09 01:45:17.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна грешка при ауторизация към отдалечения FTP сървър при доставката на URL:%U

Кеш сървърът изпрати следната FTP команда:

%f

Сървърът даде следния отговор:

%F
%g

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/bg/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/bg/ERR_FTP_NOT_FOUND 2014-03-09 01:45:17.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Следният адрес е недостъпен: %U

Кеш сървърът изпрати следната FTP команда:

%f

Сървърът даде следния отговор:

%F
%g

Това би могло да бъде причинено от FTP заявка, в която е посочен абсолютен път (което е неправилно според документ RFC 1738). Ако това е причината, то файлът би могъл да бъде намерен на адрес %B.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/bg/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/bg/ERR_FTP_PUT_CREATED 2014-03-09 01:45:18.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Операцията е успешна.

Файлът е създаден


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/bg/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/bg/ERR_FTP_PUT_ERROR 2014-03-09 01:45:19.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: FTP upload failed

ERROR

FTP PUT upload failed

Възникна грешка на FTP протокола при опит за доставка на: %U

Кеш сървърът изпрати следната FTP команда:

%f

Сървърът даде следния отговор:

%F

FTP сървърът няма права или достатъчно място за съхранение на файла. Проверете пътя, правата за достъп, свободното дисково пространство, и опитайте отново.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/bg/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/bg/ERR_FTP_PUT_MODIFIED 2014-03-09 01:45:19.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Операцията е успешна.

Файлът е обновен


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/bg/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/bg/ERR_FTP_UNAVAILABLE 2014-03-09 01:45:20.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

FTP сървърът е претоварен и не може да бъде изтеглен файлът: %U

Кеш сървърът изпрати следната FTP команда:

%f

Сървърът даде следния отговор:

%F
%g

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/bg/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/bg/ERR_GATEWAY_FAILURE 2014-03-09 01:45:20.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Gateway Proxy Failure

Непоправима софтуерна грешка или проблем в конфигурацията не позволява тази заявка да бъде завършена.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ICAP_FAILURE squid-3.4.4.1/errors/bg/ERR_ICAP_FAILURE --- squid-3.4.4/errors/bg/ERR_ICAP_FAILURE 2014-03-09 01:45:21.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Грешка на ICAP протокола.

Операционната система даде следното съобщение: %E

Неуспешна ICAP комуникация.

Възможни грешки:

  • ICAP сървърът е недостъпен.

  • Невалиден отговор от ICAP сървъра.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_INVALID_REQ squid-3.4.4.1/errors/bg/ERR_INVALID_REQ --- squid-3.4.4/errors/bg/ERR_INVALID_REQ 2014-03-09 01:45:21.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

При опит за обработка на заявката възникна следната грешка - Невалидна заявка:

%R

Възможни грешки:

  • Липсващ или непознат метод за достъп.

  • Липсващ адрес.

  • Липсващ HTTP идентификатор (HTTP/1.0).

  • Заявката е прекалено голяма.

  • Липсващо поле Content-Length за заявка от тип POST или PUT.

  • Невалиден символ в името на сървъра (напр. символът за подчертаване е недопустим)

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_INVALID_RESP squid-3.4.4.1/errors/bg/ERR_INVALID_RESP --- squid-3.4.4/errors/bg/ERR_INVALID_RESP 2014-03-09 01:45:22.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

При опит за обработка на заявката възникна следната грешка - Невалиден отговор:

%R

Отговорът на HTTP заявката, получен от отсрещния сървър, е неразбираем или невалиден. Моля свържете се със съответния администратор.

Ако Ви е необходимо, Вашият кеш администратор може би е в състояние да Ви достави по-подробни данни за възникналия проблем.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_INVALID_URL squid-3.4.4.1/errors/bg/ERR_INVALID_URL --- squid-3.4.4/errors/bg/ERR_INVALID_URL 2014-03-09 01:45:22.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Невалиден адрес

Неправилен адрес.

Възможни грешки:

  • Липсващ или невалиден протокол за достъп (трябва да е http:// или нещо подобно)

  • Липсващо име на сървъра.

  • Невалиден double-escape символ в адреса

  • Невалиден символ в името на сървъра (напр. символът за подчертаване е недопустим)

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_LIFETIME_EXP squid-3.4.4.1/errors/bg/ERR_LIFETIME_EXP --- squid-3.4.4/errors/bg/ERR_LIFETIME_EXP 2014-03-09 01:45:23.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Превишено максимално допустимо време за съществуване на връзката.

Кеш сървърът прекрати заявката, защото тя продължи повече от максимално допустимото време.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_NO_RELAY squid-3.4.4.1/errors/bg/ERR_NO_RELAY --- squid-3.4.4/errors/bg/ERR_NO_RELAY 2014-03-09 01:45:23.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Няма конфигуриран WAIS Relay

Няма дефиниран WAIS Relay за този кеш сървър. Обърнете се към администратора.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/bg/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/bg/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:45:24.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Подадена е заявка за обект, който не се намира в кеша, а попада в обсега на директивата only-if-cached.

Подадена е заявка за обект, който не се намира в кеша, а попада в обсега на директивата only-if-cached. За да бъде изпълнена заявката, документът трябва да бъде изтеглен наново или да бъде проверена неговата валидност, което е недопустимо поради директивата only-if-cached.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/error-details.txt squid-3.4.4.1/errors/bg/error-details.txt --- squid-3.4.4/errors/bg/error-details.txt 2014-03-09 01:45:31.000000000 -0800 +++ squid-3.4.4.1/errors/bg/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/bg/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/bg/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/bg/ERR_PRECONDITION_FAILED 2014-03-09 01:45:25.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Precondition Failed.

This means:

Поне едно необходимо условие, указано от клиента в хедъра на заявката, не е изпълнено.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_READ_ERROR squid-3.4.4.1/errors/bg/ERR_READ_ERROR --- squid-3.4.4/errors/bg/ERR_READ_ERROR 2014-03-09 01:45:25.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Грешка при четене

Операционната система даде следното съобщение: %E

Възникна грешка при четене на данни от мрежата. Моля, опитайте отново да направите Вашата заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_READ_TIMEOUT squid-3.4.4.1/errors/bg/ERR_READ_TIMEOUT --- squid-3.4.4/errors/bg/ERR_READ_TIMEOUT 2014-03-09 01:45:26.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Изтече максимално допустимото време за четене

Операционната система даде следното съобщение: %E

Изтече максимално допустимото време за четене на данни от мрежата. Мрежата или сървърът са недостъпни или претоварени. Моля, опитайте отново да направите Вашата заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/bg/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/bg/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:45:26.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Неуспешен опит за осъществяване на криптирана връзка към %l

The system returned:

%E (TLS code: %x)

%D

Proxy сървърът и отсрещният web сървър не могат да договорят взаимно приемливи параметри за осъществяване на връзката. Възможно е отсрещният web сървър да не приема криптирани връзки, или proxy сървърът да не приема за достатъчно нивото на сигурност на web сървъра.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/bg/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/bg/ERR_SHUTTING_DOWN 2014-03-09 01:45:27.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Кеш сървърът е в процес на рестартиране и в момента не може да изпълни вашата заявка. Моля опитайте отново след няколко минути.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/bg/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/bg/ERR_SOCKET_FAILURE 2014-03-09 01:45:27.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Грешка при Socket операция

Операционната система даде следното съобщение: %E

Кеш сървърът не е в състояние да създаде TCP socket, вероятно поради голямо натоварване. Моля, опитайте отново да направите Вашата заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_TOO_BIG squid-3.4.4.1/errors/bg/ERR_TOO_BIG --- squid-3.4.4/errors/bg/ERR_TOO_BIG 2014-03-09 01:45:28.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Заявката или отговорът са прекалено големи.

Ако Вашата заявка е от тип POST или PUT, то данните, които се опитвате да изпратите, са с прекалено голям обем.

Ако Вашата заявка е от тип GET, то файлът, който се опитвате да свалите, е прекалено голям.

Тези ограничения са поставени от Интернет доставчика, който администрира този кеш сървър. Ако считате това за неправилно, моля обърнете се към администратора.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/bg/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/bg/ERR_UNSUP_HTTPVERSION 2014-03-09 01:45:28.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

Неподдържана версия на HTTP протокола.

Възникна следната грешка при опит за достъп до: %U

Unsupported HTTP version

Кеш сървърът не поддържа версията на HTTP протокола, която се опитвате да ползвате.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_UNSUP_REQ squid-3.4.4.1/errors/bg/ERR_UNSUP_REQ --- squid-3.4.4/errors/bg/ERR_UNSUP_REQ 2014-03-09 01:45:29.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Сървърът не поддържа метода и/или протокола, посочен в заявката

Кеш сървърът не поддържа всички методи на заявка за всички протоколи. Например, не можете да заявите метод POST за протокол Gopher.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_URN_RESOLVE squid-3.4.4.1/errors/bg/ERR_URN_RESOLVE --- squid-3.4.4/errors/bg/ERR_URN_RESOLVE 2014-03-09 01:45:30.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: The requested URN could not be retrieved

ERROR

Недостатъчна информация за локализиране на обекта

Възникна следната грешка при опит за достъп до: %U

Проблем при локализиране на обекта.

Не очаквайте прекалено много на този етап :)

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_WRITE_ERROR squid-3.4.4.1/errors/bg/ERR_WRITE_ERROR --- squid-3.4.4/errors/bg/ERR_WRITE_ERROR 2014-03-09 01:45:30.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Грешка при запис

Операционната система даде следното съобщение: %E

Възникна грешка при изпращане на данни в мрежата. Моля, опитайте отново да направите Вашата заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/bg/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/bg/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/bg/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:45:31.000000000 -0800 +++ squid-3.4.4.1/errors/bg/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ГРЕШКА: Заявеният адрес е недостъпен.

ERROR

The requested URL could not be retrieved

Възникна следната грешка при опит за достъп до: %U

Отговор с нулева големина

Кеш сървърът не получи никакви данни за тази заявка.

Вашият кеш администратор е %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ca/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ca/ERR_ACCESS_DENIED 2014-03-09 01:45:32.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Accés no autoritzat.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:45:33.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ca/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ca/ERR_AGENT_CONFIGURE 2014-03-09 01:45:33.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ERROR

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_AGENT_WPAD squid-3.4.4.1/errors/ca/ERR_AGENT_WPAD --- squid-3.4.4/errors/ca/ERR_AGENT_WPAD 2014-03-09 01:45:34.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ERROR

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ca/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ca/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:45:34.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Accés denegat a la cache

ERROR

Cache Accés no autoritzat.

The following error was encountered while trying to retrieve the URL: %U

Accés denegat a la cache

L'accés a l'objecte %U no està permès sense autentificació prèvia.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:45:35.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Accés denegat a l'administració de la cache

ERROR

Cache Manager Accés no autoritzat.

The following error was encountered while trying to retrieve the URL: %U

Accés denegat a l'administració de la cache.

L'accés a l'objecte %U no està permès sense autentificació prèvia.

Contacteu ambel vostre administrador de cache. Si vosaltres sou l'administrador d'aquesta cache, llegiu-vos la documentació de l'Squid en l'apartat de l'administrador de la cache.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ca/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ca/ERR_CANNOT_FORWARD 2014-03-09 01:45:35.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

No ha estat possible de reenviar aquesta petició.

This request could not be forwarded to the origin server or to any parent caches.

Some possible problems are:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ca/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ca/ERR_CONFLICT_HOST 2014-03-09 01:45:36.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Some possible problems are:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ca/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ca/ERR_CONNECT_FAIL 2014-03-09 01:45:36.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

El sistema diu: %E

The remote host or network may be down. Please try the request again.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_DIR_LISTING squid-3.4.4.1/errors/ca/ERR_DIR_LISTING --- squid-3.4.4/errors/ca/ERR_DIR_LISTING 2014-03-09 01:45:37.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Directory Content:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_DNS_FAIL squid-3.4.4.1/errors/ca/ERR_DNS_FAIL --- squid-3.4.4/errors/ca/ERR_DNS_FAIL 2014-03-09 01:45:38.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

No ha estat possible determinar l'adreça IP del servidor %H

The DNS server returned:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ESI squid-3.4.4.1/errors/ca/ERR_ESI --- squid-3.4.4/errors/ca/ERR_ESI 2014-03-09 01:45:38.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ca/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ca/ERR_FORWARDING_DENIED 2014-03-09 01:45:39.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Reenviament denegat.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_DISABLED squid-3.4.4.1/errors/ca/ERR_FTP_DISABLED --- squid-3.4.4/errors/ca/ERR_FTP_DISABLED 2014-03-09 01:45:39.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

El protocol FTP està deshabilitat.

Aquesta cache no accepta connexions FTP.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_FAILURE squid-3.4.4.1/errors/ca/ERR_FTP_FAILURE --- squid-3.4.4/errors/ca/ERR_FTP_FAILURE 2014-03-09 01:45:40.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

S'ha produït un error FTP mentre s'intentava llegir la URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ca/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ca/ERR_FTP_FORBIDDEN 2014-03-09 01:45:40.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

S'ha produït un error en l'autentificació FTP mentre s'intentava llegir la URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ca/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ca/ERR_FTP_NOT_FOUND 2014-03-09 01:45:41.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following URL could not be retrieved: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ca/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ca/ERR_FTP_PUT_CREATED 2014-03-09 01:45:41.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operació completada

Fitxer creat


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ca/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ca/ERR_FTP_PUT_ERROR 2014-03-09 01:45:42.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: FTP upload failed

ERROR

FTP PUT upload failed

S'ha produït un error FTP mentre s'intentava llegir la URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ca/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ca/ERR_FTP_PUT_MODIFIED 2014-03-09 01:45:43.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operació completada

Fitxer actualitzat


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ca/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ca/ERR_FTP_UNAVAILABLE 2014-03-09 01:45:43.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

El servidor FTP estava massa ocupat quan intentava mostrar la URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ca/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ca/ERR_GATEWAY_FAILURE 2014-03-09 01:45:44.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ca/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ca/ERR_ICAP_FAILURE 2014-03-09 01:45:44.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

ICAP protocol error.

El sistema diu: %E

This means that some aspect of the ICAP communication failed.

Some possible problems are:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_INVALID_REQ squid-3.4.4.1/errors/ca/ERR_INVALID_REQ --- squid-3.4.4/errors/ca/ERR_INVALID_REQ 2014-03-09 01:45:45.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

Invalid Request error was encountered while trying to process the request:

%R

Some possible problems are:

  • Mètode de petició desconegut o absent.

  • no hi ha URL.

  • Falta l'identificador HTTP (HTTP/1.0).

  • La petici&ocute; és massa llarga.

  • Falta el camp Content-Length.

  • Caràcter no permès en el nom del servidor.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_INVALID_RESP squid-3.4.4.1/errors/ca/ERR_INVALID_RESP --- squid-3.4.4/errors/ca/ERR_INVALID_RESP 2014-03-09 01:45:45.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

Invalid Response error was encountered while trying to process the request:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_INVALID_URL squid-3.4.4.1/errors/ca/ERR_INVALID_URL --- squid-3.4.4/errors/ca/ERR_INVALID_URL 2014-03-09 01:45:46.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

URL incorrecte.

Alguna part de la URL no és correcte.

Some possible problems are:

  • Protocol d'accés absent o incorrecte ( http:// o similar )

  • Falta el nom del servidor.

  • La URL conté un doble caràcter d'escapament.

  • Caràcter no permès en el nom del servidor.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ca/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ca/ERR_LIFETIME_EXP 2014-03-09 01:45:46.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

La connexió ha excedit el temps màxim

Squid has terminated the request because it has exceeded the maximum connection lifetime.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_NO_RELAY squid-3.4.4.1/errors/ca/ERR_NO_RELAY --- squid-3.4.4/errors/ca/ERR_NO_RELAY 2014-03-09 01:45:47.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

No hi ha reenviament de protocol WAIS

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ca/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ca/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:45:48.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

S'ha especificat una directiva only-if-cached i no s'ha trobat un document vàlid a la cache.

Heu fet una petició amb la directiva de control de cache only-if-cached. El document no s'ha trobat a la cache, o necessitava revalidació, expressament prohibida per la directiva only-if-cached.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/error-details.txt squid-3.4.4.1/errors/ca/error-details.txt --- squid-3.4.4/errors/ca/error-details.txt 2014-03-09 01:45:54.000000000 -0800 +++ squid-3.4.4.1/errors/ca/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ca/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ca/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ca/ERR_PRECONDITION_FAILED 2014-03-09 01:45:48.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_READ_ERROR squid-3.4.4.1/errors/ca/ERR_READ_ERROR --- squid-3.4.4/errors/ca/ERR_READ_ERROR 2014-03-09 01:45:49.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Error de lectura

El sistema diu: %E

An error condition occurred while reading data from the network. Please retry your request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ca/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ca/ERR_READ_TIMEOUT 2014-03-09 01:45:49.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

S'ha excedit el temps de lectura

El sistema diu: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ca/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ca/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:45:50.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ca/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ca/ERR_SHUTTING_DOWN 2014-03-09 01:45:50.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ca/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ca/ERR_SOCKET_FAILURE 2014-03-09 01:45:51.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Errada de connexió de xarxa

El sistema diu: %E

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_TOO_BIG squid-3.4.4.1/errors/ca/ERR_TOO_BIG --- squid-3.4.4/errors/ca/ERR_TOO_BIG 2014-03-09 01:45:51.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

La petició o la resposta són massa llargues.

Si esteu fent una petició de tipus POST o PUT, llavors el cos de la petició és massa llarg (el fitxer que intenteu enviar).

Si esteu intentant descarregar-vos algunfitxer, aques és massa gros.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ca/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ca/ERR_UNSUP_HTTPVERSION 2014-03-09 01:45:52.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_UNSUP_REQ squid-3.4.4.1/errors/ca/ERR_UNSUP_REQ --- squid-3.4.4/errors/ca/ERR_UNSUP_REQ 2014-03-09 01:45:53.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Mètode i protocol no admesos

Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_URN_RESOLVE squid-3.4.4.1/errors/ca/ERR_URN_RESOLVE --- squid-3.4.4/errors/ca/ERR_URN_RESOLVE 2014-03-09 01:45:53.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

ERROR

No es pot mostrar la URN que heu sol.licitat

The following error was encountered while trying to retrieve the URN: %U

No s'ha pogut resoldre la URN

Ei :) no esperis massa de les URN a %T !!

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_WRITE_ERROR squid-3.4.4.1/errors/ca/ERR_WRITE_ERROR --- squid-3.4.4/errors/ca/ERR_WRITE_ERROR 2014-03-09 01:45:54.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Error d'escriptura

El sistema diu: %E

An error condition occurred while writing to the network. Please retry your request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/ca/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ca/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ca/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:45:54.000000000 -0800 +++ squid-3.4.4.1/errors/ca/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: No es pot mostrar la URL que heu sol.licitat

ERROR

No es pot mostrar la URL que heu sol.licitat

The following error was encountered while trying to retrieve the URL: %U

Zero Sized Reply

Squid did not receive any data for this request.

L'administrador d'aquesta cache és %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ACCESS_DENIED squid-3.4.4.1/errors/cs/ERR_ACCESS_DENIED --- squid-3.4.4/errors/cs/ERR_ACCESS_DENIED 2014-03-09 01:45:55.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Přístup odepřen.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:45:55.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/cs/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/cs/ERR_AGENT_CONFIGURE 2014-03-09 01:45:56.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

CHYBA

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_AGENT_WPAD squid-3.4.4.1/errors/cs/ERR_AGENT_WPAD --- squid-3.4.4/errors/cs/ERR_AGENT_WPAD 2014-03-09 01:45:56.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

CHYBA

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/cs/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/cs/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:45:57.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Cache Access Denied

ERROR

Cache Přístup odepřen.

The following error was encountered while trying to retrieve the URL: %U

Přístup k cache odepřen.

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:45:58.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Cache Manager Access Denied

ERROR

Cache Manager Přístup odepřen.

The following error was encountered while trying to retrieve the URL: %U

Přístup ke správci cache odepřen.

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/cs/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/cs/ERR_CANNOT_FORWARD 2014-03-09 01:45:58.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unable to forward this request at this time.

This request could not be forwarded to the origin server or to any parent caches.

Some possible problems are:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_CONFLICT_HOST squid-3.4.4.1/errors/cs/ERR_CONFLICT_HOST --- squid-3.4.4/errors/cs/ERR_CONFLICT_HOST 2014-03-09 01:45:59.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Some possible problems are:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_CONNECT_FAIL squid-3.4.4.1/errors/cs/ERR_CONNECT_FAIL --- squid-3.4.4/errors/cs/ERR_CONNECT_FAIL 2014-03-09 01:45:59.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Připojení k %I selhalo.

Vzdálený systém odpověděl: %E

The remote host or network may be down. Please try the request again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_DIR_LISTING squid-3.4.4.1/errors/cs/ERR_DIR_LISTING --- squid-3.4.4/errors/cs/ERR_DIR_LISTING 2014-03-09 01:46:00.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Adresář: %U

Adresář: %U/

Obsah adresáře:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_DNS_FAIL squid-3.4.4.1/errors/cs/ERR_DNS_FAIL --- squid-3.4.4/errors/cs/ERR_DNS_FAIL 2014-03-09 01:46:01.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Jméno serveru není možno převést na IP adresu. %H

DNS server odpověděl:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ESI squid-3.4.4.1/errors/cs/ERR_ESI --- squid-3.4.4/errors/cs/ERR_ESI 2014-03-09 01:46:02.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Selhalo zpracování ESI.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/cs/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/cs/ERR_FORWARDING_DENIED 2014-03-09 01:46:03.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Forwarding Denied.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_DISABLED squid-3.4.4.1/errors/cs/ERR_FTP_DISABLED --- squid-3.4.4/errors/cs/ERR_FTP_DISABLED 2014-03-09 01:46:03.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

FTP je zakázáno

Tento cache server nepodporuje protokol FTP.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_FAILURE squid-3.4.4.1/errors/cs/ERR_FTP_FAILURE --- squid-3.4.4/errors/cs/ERR_FTP_FAILURE 2014-03-09 01:46:04.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

Došlo k chybě protokolu FTP při pokusu získat URL: %U

odeslal Squid následující FTP příkaz:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/cs/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/cs/ERR_FTP_FORBIDDEN 2014-03-09 01:46:05.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

Došlo k chybě při autentizaci FTP při pokusu získat URL: %U

odeslal Squid následující FTP příkaz:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/cs/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/cs/ERR_FTP_NOT_FOUND 2014-03-09 01:46:05.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following URL could not be retrieved: %U

odeslal Squid následující FTP příkaz:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/cs/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/cs/ERR_FTP_PUT_CREATED 2014-03-09 01:46:06.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operace proběhla úspěšně

Soubor vytvořen


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/cs/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/cs/ERR_FTP_PUT_ERROR 2014-03-09 01:46:06.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: FTP upload failed

ERROR

FTP PUT upload failed

Došlo k chybě protokolu FTP při pokusu získat URL: %U

odeslal Squid následující FTP příkaz:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/cs/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/cs/ERR_FTP_PUT_MODIFIED 2014-03-09 01:46:07.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operace proběhla úspěšně

Soubor aktualizován


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/cs/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/cs/ERR_FTP_UNAVAILABLE 2014-03-09 01:46:08.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The FTP server was too busy to retrieve the URL: %U

odeslal Squid následující FTP příkaz:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/cs/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/cs/ERR_GATEWAY_FAILURE 2014-03-09 01:46:08.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ICAP_FAILURE squid-3.4.4.1/errors/cs/ERR_ICAP_FAILURE --- squid-3.4.4/errors/cs/ERR_ICAP_FAILURE 2014-03-09 01:46:09.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Chyba protokolu ICAP.

Vzdálený systém odpověděl: %E

This means that some aspect of the ICAP communication failed.

Some possible problems are:

  • The ICAP server is not reachable.

  • Ze serveru ICAP byla přijata neplatná odpověď.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_INVALID_REQ squid-3.4.4.1/errors/cs/ERR_INVALID_REQ --- squid-3.4.4/errors/cs/ERR_INVALID_REQ 2014-03-09 01:46:10.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

Došlo k chybě Invalid Request (Neplatný požadavek) během zpracování požadavku:

%R

Some possible problems are:

  • Chybná nebo chybějící HTTP metoda (POST, GET)

  • Chybějící URL.

  • Chybějící identifikátor HTTP (HTTP/1.0).

  • Požadavek může být příliš velký

  • Chybí 'Content-Lenght' požadavku POST nebo PUT.

  • Illegal character in hostname; underscores are not allowed.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_INVALID_RESP squid-3.4.4.1/errors/cs/ERR_INVALID_RESP --- squid-3.4.4/errors/cs/ERR_INVALID_RESP 2014-03-09 01:46:11.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

Došlo k chybě Invalid Response (Neplatná odpověď) během zpracování požadavku:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_INVALID_URL squid-3.4.4.1/errors/cs/ERR_INVALID_URL --- squid-3.4.4/errors/cs/ERR_INVALID_URL 2014-03-09 01:46:12.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Neplatná URL

Některá část URL je chybná.

Some possible problems are:

  • Missing or incorrect access protocol (should be http:// or similar)

  • Chybějící hostname

  • Chybný double-escape v URL cestě

  • Illegal character in hostname; underscores are not allowed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_LIFETIME_EXP squid-3.4.4.1/errors/cs/ERR_LIFETIME_EXP --- squid-3.4.4/errors/cs/ERR_LIFETIME_EXP 2014-03-09 01:46:12.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Čas pro spojení vypršel

Squid stornoval požadavek z důvodu překročení maximální délky trvání spojení.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_NO_RELAY squid-3.4.4.1/errors/cs/ERR_NO_RELAY --- squid-3.4.4/errors/cs/ERR_NO_RELAY 2014-03-09 01:46:13.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

No Wais Relay

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/cs/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/cs/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:46:14.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Požadovaný dokument se nenachází v cachi, přičemž byla specifikována direktiva only-if-cached.

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/error-details.txt squid-3.4.4.1/errors/cs/error-details.txt --- squid-3.4.4/errors/cs/error-details.txt 2014-03-09 01:46:22.000000000 -0800 +++ squid-3.4.4.1/errors/cs/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/cs/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/cs/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/cs/ERR_PRECONDITION_FAILED 2014-03-09 01:46:15.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_READ_ERROR squid-3.4.4.1/errors/cs/ERR_READ_ERROR --- squid-3.4.4/errors/cs/ERR_READ_ERROR 2014-03-09 01:46:15.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Chyba při čtení

Vzdálený systém odpověděl: %E

An error condition occurred while reading data from the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_READ_TIMEOUT squid-3.4.4.1/errors/cs/ERR_READ_TIMEOUT --- squid-3.4.4/errors/cs/ERR_READ_TIMEOUT 2014-03-09 01:46:16.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Read Timeout

Vzdálený systém odpověděl: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/cs/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/cs/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:46:17.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Selhalo vytvoření zabezpečeného připojení k %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/cs/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/cs/ERR_SHUTTING_DOWN 2014-03-09 01:46:18.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/cs/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/cs/ERR_SOCKET_FAILURE 2014-03-09 01:46:18.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Socket Failure

Vzdálený systém odpověděl: %E

Squid nemohl vytvořit TCP socket pravděpodobně v důsledku přetížení. Opakujte prosím Váš požadavek.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_TOO_BIG squid-3.4.4.1/errors/cs/ERR_TOO_BIG --- squid-3.4.4/errors/cs/ERR_TOO_BIG 2014-03-09 01:46:19.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

The request or reply is too large.

If you are making a POST or PUT request, then the item you are trying to upload is too large.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/cs/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/cs/ERR_UNSUP_HTTPVERSION 2014-03-09 01:46:20.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_UNSUP_REQ squid-3.4.4.1/errors/cs/ERR_UNSUP_REQ --- squid-3.4.4/errors/cs/ERR_UNSUP_REQ 2014-03-09 01:46:20.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unsupported Request Method and Protocol

Squid nepodporuje všechny typy metod u všech protokolů. Např. není možno použit metodu POST u služby GOPHER.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_URN_RESOLVE squid-3.4.4.1/errors/cs/ERR_URN_RESOLVE --- squid-3.4.4/errors/cs/ERR_URN_RESOLVE 2014-03-09 01:46:21.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: The requested URN could not be retrieved

ERROR

Nelze získat URL pro požadované URN

The following error was encountered while trying to retrieve the URN: %U

Nelze přeložit URN

Hey, neočekáváte příliš mnoho od URN na %T :)

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_WRITE_ERROR squid-3.4.4.1/errors/cs/ERR_WRITE_ERROR --- squid-3.4.4/errors/cs/ERR_WRITE_ERROR 2014-03-09 01:46:21.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Write Error

Vzdálený systém odpověděl: %E

An error condition occurred while writing to the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/cs/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/cs/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/cs/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:46:22.000000000 -0800 +++ squid-3.4.4.1/errors/cs/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný dokument je nedostupný

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Zero Sized Reply

Squid neobdržel v odpovědi na tento dotaz žádná data.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ACCESS_DENIED squid-3.4.4.1/errors/da/ERR_ACCESS_DENIED --- squid-3.4.4/errors/da/ERR_ACCESS_DENIED 2014-03-09 01:46:22.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Adgang Nægtet.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:46:23.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/da/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/da/ERR_AGENT_CONFIGURE 2014-03-09 01:46:23.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

FEJL

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_AGENT_WPAD squid-3.4.4.1/errors/da/ERR_AGENT_WPAD --- squid-3.4.4/errors/da/ERR_AGENT_WPAD 2014-03-09 01:46:24.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

FEJL

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/da/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/da/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:46:25.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Cache Access Denied

ERROR

Cache Adgang Nægtet.

The following error was encountered while trying to retrieve the URL: %U

Cache Adgang Nægtet.

Du har desværre ikke lov til at hente %U fra denne cache førend du har autenticieret dig selv.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/da/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/da/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:46:25.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Cache Manager Access Denied

ERROR

Cache Manager Adgang Nægtet.

The following error was encountered while trying to retrieve the URL: %U

Cache Administrator Adgang Nægtet.

Du har desværre ikke lov til at hente %U fra denne cache førend du har autenticieret dig selv.

Kontakt cache administratoren hvis du har problemer med at autenticiere dig eller hvis du er cache administratoren, læs Squid dokumentationen for cache administrator interfacet og check cache loggen for mere detaljerede fejlmeddelelser.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/da/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/da/ERR_CANNOT_FORWARD 2014-03-09 01:46:26.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Kunne ikke vidersende forespørgslen.

This request could not be forwarded to the origin server or to any parent caches.

Mulige problemer kan være:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_CONFLICT_HOST squid-3.4.4.1/errors/da/ERR_CONFLICT_HOST --- squid-3.4.4/errors/da/ERR_CONFLICT_HOST 2014-03-09 01:46:26.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Mulige problemer kan være:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_CONNECT_FAIL squid-3.4.4.1/errors/da/ERR_CONNECT_FAIL --- squid-3.4.4/errors/da/ERR_CONNECT_FAIL 2014-03-09 01:46:27.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

Systemet returnerede: %E

The remote host or network may be down. Please try the request again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_DIR_LISTING squid-3.4.4.1/errors/da/ERR_DIR_LISTING --- squid-3.4.4/errors/da/ERR_DIR_LISTING 2014-03-09 01:46:27.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Directory Content:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_DNS_FAIL squid-3.4.4.1/errors/da/ERR_DNS_FAIL --- squid-3.4.4/errors/da/ERR_DNS_FAIL 2014-03-09 01:46:28.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Kunne ikke finde IP nummeret for navnet %H

The DNS server returned:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ESI squid-3.4.4.1/errors/da/ERR_ESI --- squid-3.4.4/errors/da/ERR_ESI 2014-03-09 01:46:28.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/da/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/da/ERR_FORWARDING_DENIED 2014-03-09 01:46:29.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Videresendelse Nægtet.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_DISABLED squid-3.4.4.1/errors/da/ERR_FTP_DISABLED --- squid-3.4.4/errors/da/ERR_FTP_DISABLED 2014-03-09 01:46:29.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

FTP er slået fra

Denne cache understøtter ikke FTP.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_FAILURE squid-3.4.4.1/errors/da/ERR_FTP_FAILURE --- squid-3.4.4/errors/da/ERR_FTP_FAILURE 2014-03-09 01:46:30.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

En FTP protokol fejl opstod under hentning af føgende URL: %U

Proxy'en Squid sendte følgende FTP kommando:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/da/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/da/ERR_FTP_FORBIDDEN 2014-03-09 01:46:31.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

En FTP autenticierings fejl opstod under hentning af føgende URL: %U

Proxy'en Squid sendte følgende FTP kommando:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/da/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/da/ERR_FTP_NOT_FOUND 2014-03-09 01:46:31.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

Den føgende URL kunne ikke hentes: %U

Proxy'en Squid sendte følgende FTP kommando:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/da/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/da/ERR_FTP_PUT_CREATED 2014-03-09 01:46:32.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Handlingen lykkedes

Fil oprettet


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/da/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/da/ERR_FTP_PUT_ERROR 2014-03-09 01:46:32.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: FTP upload failed

ERROR

FTP PUT upload failed

En FTP protokol fejl opstod under hentning af føgende URL: %U

Proxy'en Squid sendte følgende FTP kommando:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/da/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/da/ERR_FTP_PUT_MODIFIED 2014-03-09 01:46:33.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Handlingen lykkedes

Fil opdateret


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/da/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/da/ERR_FTP_UNAVAILABLE 2014-03-09 01:46:33.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

FTP serveren var optaget da føgende URL skulle hentes: %U

Proxy'en Squid sendte følgende FTP kommando:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/da/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/da/ERR_GATEWAY_FAILURE 2014-03-09 01:46:34.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ICAP_FAILURE squid-3.4.4.1/errors/da/ERR_ICAP_FAILURE --- squid-3.4.4/errors/da/ERR_ICAP_FAILURE 2014-03-09 01:46:34.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ICAP protocol error.

Systemet returnerede: %E

This means that some aspect of the ICAP communication failed.

Mulige problemer kan være:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_INVALID_REQ squid-3.4.4.1/errors/da/ERR_INVALID_REQ --- squid-3.4.4/errors/da/ERR_INVALID_REQ 2014-03-09 01:46:35.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

Invalid Request error was encountered while trying to process the request:

%R

Mulige problemer kan være:

  • Manglende eller ukendt forespørgsels metode.

  • Manglende URL.

  • Manglende HTTP Identifikator (ved HTTP/1.0)

  • Forespørgslen er for stor.

  • Content-Length mangler til POST eller PUT forespørgsler

  • Illegal character in hostname; underscores are not allowed.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_INVALID_RESP squid-3.4.4.1/errors/da/ERR_INVALID_RESP --- squid-3.4.4/errors/da/ERR_INVALID_RESP 2014-03-09 01:46:35.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

Invalid Response error was encountered while trying to process the request:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_INVALID_URL squid-3.4.4.1/errors/da/ERR_INVALID_URL --- squid-3.4.4/errors/da/ERR_INVALID_URL 2014-03-09 01:46:36.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Ugyldig URL

Some aspect of the requested URL is incorrect.

Mulige problemer kan være:

  • Manglende eller ukendt adgangsprotokol (burde være http:// eller tilsvarende)

  • Manglende maskinnavn

  • Ugyldig dobbelt-escape i URL sti

  • Illegal character in hostname; underscores are not allowed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_LIFETIME_EXP squid-3.4.4.1/errors/da/ERR_LIFETIME_EXP --- squid-3.4.4/errors/da/ERR_LIFETIME_EXP 2014-03-09 01:46:36.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Levetiden for forbindelsen udløb

Proxy'en Squid har afsluttet forespørgslen fordi den har overskredet den maksimale levetid for forbindelser (connection timeout).

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_NO_RELAY squid-3.4.4.1/errors/da/ERR_NO_RELAY --- squid-3.4.4/errors/da/ERR_NO_RELAY 2014-03-09 01:46:37.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Ingen WAIS Relæ

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/da/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/da/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:46:38.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Dokumentet blev ikke fundet i cachen og only-if-cached (kun-hvis-gemt-i-cachen) direktivet var specificeret.

Du har sendt en forespørgsel med en only-if-cached cache kontrol direktiv. Dokumentet blev ikke fundet i cachen, eller det kræver en bekræftelse af gyldighed som bliver forbudt af only-if-cached direktivet.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/error-details.txt squid-3.4.4.1/errors/da/error-details.txt --- squid-3.4.4/errors/da/error-details.txt 2014-03-09 01:46:44.000000000 -0800 +++ squid-3.4.4.1/errors/da/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/da/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/da/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/da/ERR_PRECONDITION_FAILED 2014-03-09 01:46:38.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_READ_ERROR squid-3.4.4.1/errors/da/ERR_READ_ERROR --- squid-3.4.4/errors/da/ERR_READ_ERROR 2014-03-09 01:46:39.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Læse fejl

Systemet returnerede: %E

An error condition occurred while reading data from the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_READ_TIMEOUT squid-3.4.4.1/errors/da/ERR_READ_TIMEOUT --- squid-3.4.4/errors/da/ERR_READ_TIMEOUT 2014-03-09 01:46:39.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Read Timeout

Systemet returnerede: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/da/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/da/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:46:40.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/da/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/da/ERR_SHUTTING_DOWN 2014-03-09 01:46:40.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/da/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/da/ERR_SOCKET_FAILURE 2014-03-09 01:46:41.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Socket Fejl

Systemet returnerede: %E

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_TOO_BIG squid-3.4.4.1/errors/da/ERR_TOO_BIG --- squid-3.4.4/errors/da/ERR_TOO_BIG 2014-03-09 01:46:41.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

The request or reply is too large.

If you are making a POST or PUT request, then the item you are trying to upload is too large.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/da/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/da/ERR_UNSUP_HTTPVERSION 2014-03-09 01:46:42.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_UNSUP_REQ squid-3.4.4.1/errors/da/ERR_UNSUP_REQ --- squid-3.4.4/errors/da/ERR_UNSUP_REQ 2014-03-09 01:46:42.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Uunderstøttet Forespørgsels Metode og Protokol

Proxy'en Squid understøtter ikke alle forespørgselsmetoder for alle adgangs protokoller. For eksempel kan du ikke POST en Gopher forespørgsel.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_URN_RESOLVE squid-3.4.4.1/errors/da/ERR_URN_RESOLVE --- squid-3.4.4/errors/da/ERR_URN_RESOLVE 2014-03-09 01:46:43.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: The requested URN could not be retrieved

ERROR

URL for den angivne URN kunne ikke hentes

The following error was encountered while trying to retrieve the URN: %U

Kan Ikke Opløse URN

Hallo, forvent nu ikke for meget af URNs på %T :)

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_WRITE_ERROR squid-3.4.4.1/errors/da/ERR_WRITE_ERROR --- squid-3.4.4/errors/da/ERR_WRITE_ERROR 2014-03-09 01:46:43.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Skrive Fejl

Systemet returnerede: %E

An error condition occurred while writing to the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/da/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/da/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/da/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:46:44.000000000 -0800 +++ squid-3.4.4.1/errors/da/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEJL: Den angivne URL kunne ikke hentes

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Nul Størrelse Svar

Squid did not receive any data for this request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ACCESS_DENIED squid-3.4.4.1/errors/de/ERR_ACCESS_DENIED --- squid-3.4.4/errors/de/ERR_ACCESS_DENIED 2014-03-09 01:46:45.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Zugriff verweigert.

Die Anfrage wurde aufgrund mangelnder Zugriffsrechte verweigert. Bitte kontaktieren Sie Ihren Dienstanbieter falls sie denken, dass dies ein Fehler ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:46:45.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

Diese Einschränkungen wurden vom Internetdienstanbieter eingerichtet der diesen Cache betreibt. Bitte kontaktieren sie ihn falls sie denken, dass dies ein Fehler ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/de/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/de/ERR_AGENT_CONFIGURE 2014-03-09 01:46:46.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Webbrowserkonfiguration

FEHLER

Web Browser Configuration

Ihre Webbrowserkonfiguration muss korrigiert werden um dieses Netzwerk zu nutzen.

Wie sie diese Einstellung in ihrem Browser finden:

Für Firefox Browser gehen sie zu:
  • Extras -> Optionen -> Erweitert -> Netzwerk -> Verbindungseinstellungen
  • Im HTTP Proxy Feld geben sie den Proxy Namen %h und Port %b ein.
Für Internet Explorer Browser gehen sie zu:
  • Extras -> Internetoptionen -> Verbindung -> LAN Einstellungen ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
Für Opera Browser gehen sie zu:
  • Extras -> Einstellungen -> Erweitert -> Netzwerk -> Proxyserver
  • In the HTTP proxy box type the proxy name %h and port %b.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_AGENT_WPAD squid-3.4.4.1/errors/de/ERR_AGENT_WPAD --- squid-3.4.4/errors/de/ERR_AGENT_WPAD 2014-03-09 01:46:46.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Webbrowserkonfiguration

FEHLER

Web Browser Configuration

Ihre Webbrowserkonfiguration muss korrigiert werden um dieses Netzwerk zu nutzen.

Wie sie diese Einstellung in ihrem Browser finden:

Für Firefox Browser gehen sie zu:
  • Extras -> Optionen -> Erweitert -> Netzwerk -> Verbindungseinstellungen
  • Wählen sie Automatische Suche von Einstellungen für dieses Netzwerk
Für Internet Explorer Browser gehen sie zu:
  • Extras -> Internetoptionen -> Verbindung -> LAN Einstellungen ->Proxy
  • Automatische Suche von Einstellungen
Für Opera Browser gehen sie zu:
  • Extras -> Einstellungen -> Erweitert -> Netzwerk -> Proxyserver
  • Automatisches Konfigurationsskript verwenden

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/de/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/de/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:46:47.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Cache Access Denied

ERROR

Cache Zugriff verweigert.

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Cache Zugriff verweigert.

Sie sind momentan nicht berechtigt %U von diesem Cache abzurufen, bis sie sich authentifiziert haben.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/de/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/de/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:46:47.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Cache Manager Access Denied

ERROR

Cache Manager Zugriff verweigert.

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Cache Manager Zugriff verweigert.

Sie sind momentan nicht berechtigt %U von diesem Cache Manager abzurufen, bis sie sich authentifiziert haben.

Bitte kontaktieren sie den Cache Administrator Falls sie Schwierigkeiten haben sich zu authentifizieren oder, falls sie der Administrator sind, lesen sie die Squid Dokumentation zum Thema Cacheverwaltungsoberfläche und prüfen sie das Cachelog für detaillierte Fehlermeldungen.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/de/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/de/ERR_CANNOT_FORWARD 2014-03-09 01:46:48.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Kann die Anfrage zurzeit nicht weiterleiten.

This request could not be forwarded to the origin server or to any parent caches.

Mögliche Probleme sind:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_CONFLICT_HOST squid-3.4.4.1/errors/de/ERR_CONFLICT_HOST --- squid-3.4.4/errors/de/ERR_CONFLICT_HOST 2014-03-09 01:46:48.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Mögliche Probleme sind:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_CONNECT_FAIL squid-3.4.4.1/errors/de/ERR_CONNECT_FAIL --- squid-3.4.4/errors/de/ERR_CONNECT_FAIL 2014-03-09 01:46:49.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Verbindung zu %I Fehlgeschlagen.

Das System antwortete: %E

Der Zielhost oder das Zielnetzwerk ist momentan nicht verfügbar. Bitte wiederholen sie die Anfrage.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_DIR_LISTING squid-3.4.4.1/errors/de/ERR_DIR_LISTING --- squid-3.4.4/errors/de/ERR_DIR_LISTING 2014-03-09 01:46:50.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Verzeichnis: %U

Verzeichnis: %U/

Verzeichnisinhalt:

%z
%g
Übergeordnetes Verzeichnis (Stammverzeichnis)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_DNS_FAIL squid-3.4.4.1/errors/de/ERR_DNS_FAIL --- squid-3.4.4/errors/de/ERR_DNS_FAIL 2014-03-09 01:46:50.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Konnte keine IP Adresse vom Hostnamen %H ermitteln.

Der DNS-Server meldete:

%z

Das heißt, dass der Cache nicht in der Lage war den Hostnamen aufzulösen der in der URL gefunden wurde. Überprüfen sie ob die Adresse korrekt ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ESI squid-3.4.4.1/errors/de/ERR_ESI --- squid-3.4.4/errors/de/ERR_ESI 2014-03-09 01:46:51.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

ESI-Verarbeitung fehlgeschlagen.

Der ESI-Prozessor meldete:

%Z

Das heißt, dass der Ersatz nicht in der Lage war das ESI Template zu verarbeiten. Bitte melden sie diesen Fehler dem Webmaster.

Ihr Webmaster ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/de/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/de/ERR_FORWARDING_DENIED 2014-03-09 01:46:51.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Weiterleitung verweigert.

Dieser Cache wird ihre Anfrage nicht weiterleiten da er versucht ein Geschwisterverhältnis zu erzwingen. Warscheinlich ist der Client auf %i ein Cache der falsch konfiguriert wurde.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_DISABLED squid-3.4.4.1/errors/de/ERR_FTP_DISABLED --- squid-3.4.4/errors/de/ERR_FTP_DISABLED 2014-03-09 01:46:52.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

FTP ist deaktiviert

Dieser Cache unterstützt kein FTP.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_FAILURE squid-3.4.4.1/errors/de/ERR_FTP_FAILURE --- squid-3.4.4/errors/de/ERR_FTP_FAILURE 2014-03-09 01:46:52.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Ein FTP Protokollfehler ist bei der URL %U aufgetreten.

Squid sendete das folgende FTP Kommando:

%f

Der Server antwortete:

%F
%g

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/de/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/de/ERR_FTP_FORBIDDEN 2014-03-09 01:46:53.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Die FTP Authentifizierung bei der URL %U ist Fehlgeschlagen.

Squid sendete das folgende FTP Kommando:

%f

Der Server antwortete:

%F
%g

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/de/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/de/ERR_FTP_NOT_FOUND 2014-03-09 01:46:55.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Die folgende URL konnte nicht gefunden werden: %U

Squid sendete das folgende FTP Kommando:

%f

Der Server antwortete:

%F
%g

Die Ursache kann eine FTP URL mit einem Absoluten Pfad sein (was nicht RFC 1738 konform ist). Wenn dies der Fall ist, ist die Datei unter %B zu finden.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/de/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/de/ERR_FTP_PUT_CREATED 2014-03-09 01:46:55.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Erfolgreich.

Operation Erfolgreich

Datei erstellt


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/de/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/de/ERR_FTP_PUT_ERROR 2014-03-09 01:46:56.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: FTP upload failed

ERROR

FTP PUT Upload fehlgeschlagen

Ein FTP Protokollfehler ist bei der URL %U aufgetreten.

Squid sendete das folgende FTP Kommando:

%f

Der Server antwortete:

%F

Das heißt, dass der FTP Server keine Berechtigung oder nicht genug Plattenplatz zum Speichern der Datei zur Verfügung hat. Überprüfen sie Pfad, Berechtigungen und Plattenplatz und wiederholen sie die Anfrage.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/de/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/de/ERR_FTP_PUT_MODIFIED 2014-03-09 01:46:57.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Erfolgreich.

Operation Erfolgreich

Datei aktualisiert


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/de/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/de/ERR_FTP_UNAVAILABLE 2014-03-09 01:46:57.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der FTP Server war zu beschäftigt um die URL: %U abzurufen

Squid sendete das folgende FTP Kommando:

%f

Der Server antwortete:

%F
%g

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/de/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/de/ERR_GATEWAY_FAILURE 2014-03-09 01:46:58.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Gateway Proxy Failure

Ein nicht-behebbarer interner Fehler oder ein Konfigurationsproblem verhindert die Ausführung der Anfrage.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ICAP_FAILURE squid-3.4.4.1/errors/de/ERR_ICAP_FAILURE --- squid-3.4.4/errors/de/ERR_ICAP_FAILURE 2014-03-09 01:46:58.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

ICAP Protokoll Fehler.

Das System antwortete: %E

Das heißt, dass etwas mit der ICAP Kommunikation nicht stimmt.

Mögliche Probleme sind:

  • Der ICAP Server ist nicht erreichbar.

  • Die Antwort des ICAP Servers war ungültig.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_INVALID_REQ squid-3.4.4.1/errors/de/ERR_INVALID_REQ --- squid-3.4.4/errors/de/ERR_INVALID_REQ 2014-03-09 01:46:59.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Ungültige Anfrage Fehler erhalten als versucht wurde die Anfrage zu bearbeiten:

%R

Mögliche Probleme sind:

  • Fehlende oder unbekannte Anfragemethode.

  • Fehlende URL.

  • Fehlende HTTP-Version (HTTP/1.0).

  • Anfrage ist zu lang.

  • Content-Length fehlt für POST oder PUT Anfragen.

  • Ungültiges Zeichen im Hostname; Unterstriche sind nicht erlaubt.

  • HTTP/1.1 Expect wird von einer HTTP/1.0 Software erfragt

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_INVALID_RESP squid-3.4.4.1/errors/de/ERR_INVALID_RESP --- squid-3.4.4/errors/de/ERR_INVALID_RESP 2014-03-09 01:47:00.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Ungültige Antwort Fehler erhalten als versucht wurde die Anfrage zu bearbeiten:

%R

Die HTTP Antwortnachricht, die vom Kontaktierten Server empfangen wurde, wurde nicht verstanden oder ist falsch. Bitte kontaktieren sie den Webmaster.

Ihr Cache Administrator ist in der Lage ihnen mehr über das Problem zu erklären, falls dies Notwendig ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_INVALID_URL squid-3.4.4.1/errors/de/ERR_INVALID_URL --- squid-3.4.4/errors/de/ERR_INVALID_URL 2014-03-09 01:47:00.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Ungültige URL

Der Syntax der angeforderten URL ist falsch.

Mögliche Probleme sind:

  • Fehlendes oder ungültiges Adressprotokoll (Versuchen sie zum Beispielhttp://)

  • Fehlender Hostname

  • Ungültiger Doppel-Escape im URL-Pfad

  • Ungültiges Zeichen im Hostname; Unterstriche sind nicht erlaubt.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_LIFETIME_EXP squid-3.4.4.1/errors/de/ERR_LIFETIME_EXP --- squid-3.4.4/errors/de/ERR_LIFETIME_EXP 2014-03-09 01:47:01.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Zeitlimit der Verbindung erreicht

Squid hat die Anfrage beendet, da die maximale Verbindungszeit überschritten wurde.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_NO_RELAY squid-3.4.4.1/errors/de/ERR_NO_RELAY --- squid-3.4.4/errors/de/ERR_NO_RELAY 2014-03-09 01:47:01.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Kein Wais Relay

Es ist kein WAIS Relay für diesen Cache definiert! Sagen sie dies dem Administrator.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/de/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/de/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:47:02.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Kein gültiges Dokument wurde im Cache gefunden und only-if-cached Option wurde angegeben.

Sie haben eine Anfrage mit der only-if-cached Cache Kontrolloption getätigt. Das Dokument wurde nicht im Cache gefunden, oder es forderte eine Aktualisierung an welche durch die only-if-cached Option unterbunden wurde.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/error-details.txt squid-3.4.4.1/errors/de/error-details.txt --- squid-3.4.4/errors/de/error-details.txt 2014-03-09 01:47:09.000000000 -0800 +++ squid-3.4.4.1/errors/de/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/de/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/de/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/de/ERR_PRECONDITION_FAILED 2014-03-09 01:47:02.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Bedingung nicht Erfüllt.

Dies Bedeutet:

Mindestens eine Bedingung, die vom HTTP Client vorrausgesetzt wird, wurde nicht erfüllt.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_READ_ERROR squid-3.4.4.1/errors/de/ERR_READ_ERROR --- squid-3.4.4/errors/de/ERR_READ_ERROR 2014-03-09 01:47:03.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Lesefehler

Das System antwortete: %E

Ein Fehler ist beim Lesen vom Netzwerk aufgetreten. Bitte wiederholen sie die Anfrage.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_READ_TIMEOUT squid-3.4.4.1/errors/de/ERR_READ_TIMEOUT --- squid-3.4.4/errors/de/ERR_READ_TIMEOUT 2014-03-09 01:47:04.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Zeitüberschreitung beim Lesen

Das System antwortete: %E

Zeitüberschreitung beim Warten auf Daten des Netzwerks. Das Netzwerk oder der Server könnten nicht verfügbar oder überlastet sein. Bitte versuchen sie es erneut.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/de/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/de/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:47:04.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Konnte keine sichere Verbindung zu %I herstellen

The system returned:

%E (TLS code: %x)

%D

Dieser Proxy und der Zielhost waren nicht in der Lage Sicherheitseinstellungen auszuhandeln die beidseitig akzeptiert werden. Es ist möglich dass der Zielhost keine sicheren Verbindungen unterstützte oder der Proxy nicht mit dem Sicherheitszertifikat des Hosts einverstanden ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/de/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/de/ERR_SHUTTING_DOWN 2014-03-09 01:47:05.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Dieser Cache wird momentan heruntergefahren und kann daher die Anfrage nicht bearbeiten. Bitte wiederholen sie die Anfrage gleich noch einmal.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/de/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/de/ERR_SOCKET_FAILURE 2014-03-09 01:47:05.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Socketfehler

Das System antwortete: %E

Squid kann keinen TCP-Socket erstellen, wahrscheinlich aufgrund von großer Systemlast. Bitte wiederholen Sie die Anfrage.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_TOO_BIG squid-3.4.4.1/errors/de/ERR_TOO_BIG --- squid-3.4.4/errors/de/ERR_TOO_BIG 2014-03-09 01:47:06.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Die Anfrage oder Antwort ist zu lang.

Für einen POST-Request ist die hochzuladene Resource zu groß.

Für einen GET-Request ist die angeforderte Resource zu groß.

Diese Einschränkungen wurden vom Internetdienstanbieter eingerichtet der diesen Cache betreibt. Bitte kontaktieren sie ihn falls sie denken, dass dies ein Fehler ist.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/de/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/de/ERR_UNSUP_HTTPVERSION 2014-03-09 01:47:06.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

Nicht unterstützte HTTP Version

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Unsupported HTTP version

Dieser Squid akzeptiert die angeforderte HTTP Version nicht.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_UNSUP_REQ squid-3.4.4.1/errors/de/ERR_UNSUP_REQ --- squid-3.4.4/errors/de/ERR_UNSUP_REQ 2014-03-09 01:47:07.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Anfragemethode und Protokoll nicht unterstützt

Squid unterstützt nicht alle Anfragemethoden für alle Protokolle. Sie können zum Beispiel keine POST Anfrage über das Gopher Protokoll senden.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_URN_RESOLVE squid-3.4.4.1/errors/de/ERR_URN_RESOLVE --- squid-3.4.4/errors/de/ERR_URN_RESOLVE 2014-03-09 01:47:08.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: The requested URN could not be retrieved

ERROR

Eine URL für den angeforderten URN konnte nicht gefunden werden

Der folgende Fehler wurde beim Versuch die URN %U zu holen festgestellt:

Konnte URN nicht auflösen

Hey, erwarten sie nicht zuviel von URNs auf %T :)

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_WRITE_ERROR squid-3.4.4.1/errors/de/ERR_WRITE_ERROR --- squid-3.4.4/errors/de/ERR_WRITE_ERROR 2014-03-09 01:47:08.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Fehler beim Schreiben

Das System antwortete: %E

Ein Fehler ist beim Schreiben auf das Netzwerk aufgetreten. Bitte wiederholen sie die Anfrage.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/de/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/de/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/de/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:47:09.000000000 -0800 +++ squid-3.4.4.1/errors/de/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEHLER: Die angeforderte URL konnte nicht gefunden werden

ERROR

The requested URL could not be retrieved

Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:

Nullgrößenantwort

Squid hat keine Daten für diese Anfrage empfangen.

Ihr Cache Administrator ist %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ACCESS_DENIED squid-3.4.4.1/errors/el/ERR_ACCESS_DENIED --- squid-3.4.4/errors/el/ERR_ACCESS_DENIED 2014-03-09 01:47:09.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Απαγορεύεται η Πρόσβαση.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:47:10.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/el/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/el/ERR_AGENT_CONFIGURE 2014-03-09 01:47:10.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ΣΦΑΛΜΑ

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_AGENT_WPAD squid-3.4.4.1/errors/el/ERR_AGENT_WPAD --- squid-3.4.4/errors/el/ERR_AGENT_WPAD 2014-03-09 01:47:11.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ΣΦΑΛΜΑ

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/el/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/el/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:47:12.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: Cache Access Denied

ERROR

Cache Απαγορεύεται η Πρόσβαση.

The following error was encountered while trying to retrieve the URL: %U

Απαγορεύεται η Πρόσβαση στο Μεσολαβητή.

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/el/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/el/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:47:12.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: Cache Manager Access Denied

ERROR

Cache Manager Απαγορεύεται η Πρόσβαση.

The following error was encountered while trying to retrieve the URL: %U

Απαγορεύεται η Πρόσβαση στη Διαχείριση του Μεσολαβητή.

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Επικοινωνήστε με τον διαχειριστή του μεσολαβητή σας αν αντιμετωπίζετε δυσκολία να πιστοποιήσετε τον λογαριασμό σας ή αν είστε ο διαχειριστής, διαβάστε την τεκμηρίωση του Squid σχετικά με τη διαχείριση του και κοιτάξτε τα ημερολόγια του προγράμματος για πιο λεπτομερείς αναφορές σφάλματος.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/el/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/el/ERR_CANNOT_FORWARD 2014-03-09 01:47:13.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Αδύνατη η προώθηση της αιτήσεως σας αυτή τη στιγμή.

This request could not be forwarded to the origin server or to any parent caches.

Some possible problems are:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_CONFLICT_HOST squid-3.4.4.1/errors/el/ERR_CONFLICT_HOST --- squid-3.4.4/errors/el/ERR_CONFLICT_HOST 2014-03-09 01:47:13.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Some possible problems are:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_CONNECT_FAIL squid-3.4.4.1/errors/el/ERR_CONNECT_FAIL --- squid-3.4.4/errors/el/ERR_CONNECT_FAIL 2014-03-09 01:47:14.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

Το σύστημα ενημέρωσε ότι: %E

The remote host or network may be down. Please try the request again.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_DIR_LISTING squid-3.4.4.1/errors/el/ERR_DIR_LISTING --- squid-3.4.4/errors/el/ERR_DIR_LISTING 2014-03-09 01:47:14.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Directory Content:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_DNS_FAIL squid-3.4.4.1/errors/el/ERR_DNS_FAIL --- squid-3.4.4/errors/el/ERR_DNS_FAIL 2014-03-09 01:47:15.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Δεν ήταν δυνατόν να εξακριβωθεί η διεύθυνση IP για το όνομα %H

The DNS server returned:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ESI squid-3.4.4.1/errors/el/ERR_ESI --- squid-3.4.4/errors/el/ERR_ESI 2014-03-09 01:47:16.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/el/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/el/ERR_FORWARDING_DENIED 2014-03-09 01:47:16.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Απαγορεύεται η προώθηση.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_DISABLED squid-3.4.4.1/errors/el/ERR_FTP_DISABLED --- squid-3.4.4/errors/el/ERR_FTP_DISABLED 2014-03-09 01:47:17.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Το πρωτόκολλο FTP είναι απενεργοποιημένο

Αυτός ο μεσολαβητής δεν υποστηρίζει FTP.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_FAILURE squid-3.4.4.1/errors/el/ERR_FTP_FAILURE --- squid-3.4.4/errors/el/ERR_FTP_FAILURE 2014-03-09 01:47:17.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Κατά την προσπάθεια πρόσβασης στη διεύθυνση Προέκυψε σφάλμα στο πρωτόκολλο FTP: %U

Το Squid έστειλε τη ακόλουθη εντολή FTP:

%f

The server responded with:

%F
%g

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/el/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/el/ERR_FTP_FORBIDDEN 2014-03-09 01:47:18.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Κατά την προσπάθεια πρόσβασης στη διεύθυνση Προέκυψε σφάλμα εξακρίβωσης FTP: %U

Το Squid έστειλε τη ακόλουθη εντολή FTP:

%f

The server responded with:

%F
%g

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/el/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/el/ERR_FTP_NOT_FOUND 2014-03-09 01:47:18.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Η ακόλουθη διεύθυνση δεν βρέθηκε: %U

Το Squid έστειλε τη ακόλουθη εντολή FTP:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/el/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/el/ERR_FTP_PUT_CREATED 2014-03-09 01:47:19.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Η λειτουργία ολοκληρώθηκε με επιτυχία

Το αρχείο δημιουργήθηκε


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/el/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/el/ERR_FTP_PUT_ERROR 2014-03-09 01:47:20.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: FTP upload failed

ERROR

FTP PUT upload failed

Κατά την προσπάθεια πρόσβασης στη διεύθυνση Προέκυψε σφάλμα στο πρωτόκολλο FTP: %U

Το Squid έστειλε τη ακόλουθη εντολή FTP:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/el/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/el/ERR_FTP_PUT_MODIFIED 2014-03-09 01:47:20.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Η λειτουργία ολοκληρώθηκε με επιτυχία

Το αρχείο ανανεώθηκε


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/el/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/el/ERR_FTP_UNAVAILABLE 2014-03-09 01:47:21.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The FTP server was too busy to retrieve the URL: %U

Το Squid έστειλε τη ακόλουθη εντολή FTP:

%f

The server responded with:

%F
%g

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/el/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/el/ERR_GATEWAY_FAILURE 2014-03-09 01:47:21.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ICAP_FAILURE squid-3.4.4.1/errors/el/ERR_ICAP_FAILURE --- squid-3.4.4/errors/el/ERR_ICAP_FAILURE 2014-03-09 01:47:22.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ICAP protocol error.

Το σύστημα ενημέρωσε ότι: %E

This means that some aspect of the ICAP communication failed.

Some possible problems are:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_INVALID_REQ squid-3.4.4.1/errors/el/ERR_INVALID_REQ --- squid-3.4.4/errors/el/ERR_INVALID_REQ 2014-03-09 01:47:23.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Request error was encountered while trying to process the request:

%R

Some possible problems are:

  • Ελλιπής ή άγνωστη μέθοδος αίτησης.

  • Missing URL.

  • Ελλιπές αναγνωριστικό HTTP (HTTP/1.0)

  • Η αίτηση είναι υπερμεγέθης.

  • Έλειπες Περιεχόμενο- Μήκος για τις αιτήσεις POST ή PUT

  • Άκυροι χαρακτήρες στο όνομα υπολογιστή, οι υπογεγραμμένες δεν επιτρέπονται.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_INVALID_RESP squid-3.4.4.1/errors/el/ERR_INVALID_RESP --- squid-3.4.4/errors/el/ERR_INVALID_RESP 2014-03-09 01:47:24.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Response error was encountered while trying to process the request:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_INVALID_URL squid-3.4.4.1/errors/el/ERR_INVALID_URL --- squid-3.4.4/errors/el/ERR_INVALID_URL 2014-03-09 01:47:24.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Λανθασμένη Διεύθυνση

Υπάρχει πρόβλημα με την αιτούμενη διεύθυνση.

Some possible problems are:

  • Ελλιπές ή λανθασμένο πρωτόκολλο πρόσβασης (θα πρέπει να είναι http:// ή παρόμοιο)

  • Ελλιπές όνομα υπολογιστή

  • Λανθασμένοι χαρακτήρες διαφυγής στη διεύθυνση

  • Άκυροι χαρακτήρες στο όνομα υπολογιστή, οι υπογεγραμμένες δεν επιτρέπονται.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_LIFETIME_EXP squid-3.4.4.1/errors/el/ERR_LIFETIME_EXP --- squid-3.4.4/errors/el/ERR_LIFETIME_EXP 2014-03-09 01:47:25.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Έληξε ο Χρόνος Σύνδεσής

Το Squid τερμάτισε την αίτηση επειδή ξεπέρασε τον μέγιστο χρόνο σύνδεσης.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_NO_RELAY squid-3.4.4.1/errors/el/ERR_NO_RELAY --- squid-3.4.4/errors/el/ERR_NO_RELAY 2014-03-09 01:47:25.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Δεν υπάρχει Wais Relay

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/el/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/el/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:47:26.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Δεν βρέθηκε έγκυρο αντίγραφο στην μνήμη και έχει καθοριστεί η επιλογή only-if-cached.

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/error-details.txt squid-3.4.4.1/errors/el/error-details.txt --- squid-3.4.4/errors/el/error-details.txt 2014-03-09 01:47:34.000000000 -0800 +++ squid-3.4.4.1/errors/el/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/el/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/el/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/el/ERR_PRECONDITION_FAILED 2014-03-09 01:47:27.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_READ_ERROR squid-3.4.4.1/errors/el/ERR_READ_ERROR --- squid-3.4.4/errors/el/ERR_READ_ERROR 2014-03-09 01:47:27.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Σφάλμα Ανάγνωσης

Το σύστημα ενημέρωσε ότι: %E

An error condition occurred while reading data from the network. Please retry your request.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_READ_TIMEOUT squid-3.4.4.1/errors/el/ERR_READ_TIMEOUT --- squid-3.4.4/errors/el/ERR_READ_TIMEOUT 2014-03-09 01:47:28.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Τέλος Χρόνου Ανάγνωσης

Το σύστημα ενημέρωσε ότι: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/el/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/el/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:47:28.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/el/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/el/ERR_SHUTTING_DOWN 2014-03-09 01:47:29.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/el/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/el/ERR_SOCKET_FAILURE 2014-03-09 01:47:30.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Σφάλμα Σύνδεσης

Το σύστημα ενημέρωσε ότι: %E

Το Squid δεν μπορεί να δημιουργήσει σύνδεση TCP, υποθετικά λόγω φόρτου. Παρακαλώ ξαναδοκιμάστε.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_TOO_BIG squid-3.4.4.1/errors/el/ERR_TOO_BIG --- squid-3.4.4/errors/el/ERR_TOO_BIG 2014-03-09 01:47:31.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Το αίτημα ή η απάντηση είναι υπερμεγέθη.

Αν κάνετε μια αίτηση POST ή PUT, τότε το σώμα αυτό που προσπαθείτε να ανεβάσετε είναι πολύ μεγάλο.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/el/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/el/ERR_UNSUP_HTTPVERSION 2014-03-09 01:47:31.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_UNSUP_REQ squid-3.4.4.1/errors/el/ERR_UNSUP_REQ --- squid-3.4.4/errors/el/ERR_UNSUP_REQ 2014-03-09 01:47:32.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Μη υποστηριζόμενη μέθοδος αίτησης και πρωτόκολλο

Το Squid δεν υποστηρίζει όλες τις μεθόδους αιτήσεων για όλα τα πρωτόκολλα πρόσβασης. Για παράδειγμα, το POST για Gopher δεν υποστηρίζεται.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_URN_RESOLVE squid-3.4.4.1/errors/el/ERR_URN_RESOLVE --- squid-3.4.4/errors/el/ERR_URN_RESOLVE 2014-03-09 01:47:32.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URN could not be retrieved

ERROR

A URL for the requested URN could not be retrieved

The following error was encountered while trying to retrieve the URN: %U

Cannot Resolve URN

Μεταξύ μας, μην περιμένετε και πολλά από URNs στο %T :)

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_WRITE_ERROR squid-3.4.4.1/errors/el/ERR_WRITE_ERROR --- squid-3.4.4/errors/el/ERR_WRITE_ERROR 2014-03-09 01:47:33.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Σφάλμα Εγγραφής

Το σύστημα ενημέρωσε ότι: %E

An error condition occurred while writing to the network. Please retry your request.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/el/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/el/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/el/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:47:34.000000000 -0800 +++ squid-3.4.4.1/errors/el/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ΣΦΑΛΜΑ: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Απάντηση Μηδενικού Μεγέθους

Squid did not receive any data for this request.

Ο διαχειριστής του μεσολαβητή σας είναι ο %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ACCESS_DENIED squid-3.4.4.1/errors/en/ERR_ACCESS_DENIED --- squid-3.4.4/errors/en/ERR_ACCESS_DENIED 2014-03-09 01:47:34.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Access Denied.

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:47:35.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/en/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/en/ERR_AGENT_CONFIGURE 2014-03-09 01:47:36.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ERROR

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • In the HTTP proxy box type the proxy name %h and port %b.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_AGENT_WPAD squid-3.4.4.1/errors/en/ERR_AGENT_WPAD --- squid-3.4.4/errors/en/ERR_AGENT_WPAD 2014-03-09 01:47:36.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

ERROR

Web Browser Configuration

Your Web Browser configuration needs to be corrected to use this network.

How to find these settings in your browser:

For Firefox browsers go to:
  • Tools -> Options -> Advanced -> Network -> Connection Settings
  • Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
  • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
  • Select Automatically detect settings
For Opera browsers go to:
  • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
  • Select Use Automatic proxy configuration

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/en/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/en/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:47:37.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Access Denied

ERROR

Cache Access Denied.

The following error was encountered while trying to retrieve the URL: %U

Cache Access Denied.

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/en/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/en/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:47:37.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Manager Access Denied

ERROR

Cache Manager Access Denied.

The following error was encountered while trying to retrieve the URL: %U

Cache Manager Access Denied.

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/en/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/en/ERR_CANNOT_FORWARD 2014-03-09 01:47:38.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unable to forward this request at this time.

This request could not be forwarded to the origin server or to any parent caches.

Some possible problems are:

  • An Internet connection needed to access this domains origin servers may be down.
  • All configured parent caches may be currently unreachable.
  • The administrator may not allow this cache to make direct connections to origin servers.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_CONFLICT_HOST squid-3.4.4.1/errors/en/ERR_CONFLICT_HOST --- squid-3.4.4/errors/en/ERR_CONFLICT_HOST 2014-03-09 01:47:39.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

URI Host Conflict

This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

Some possible problems are:

  • The domain may have moved very recently. Trying again will resolve that.
  • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_CONNECT_FAIL squid-3.4.4.1/errors/en/ERR_CONNECT_FAIL --- squid-3.4.4/errors/en/ERR_CONNECT_FAIL 2014-03-09 01:47:39.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection to %I failed.

The system returned: %E

The remote host or network may be down. Please try the request again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_DIR_LISTING squid-3.4.4.1/errors/en/ERR_DIR_LISTING --- squid-3.4.4/errors/en/ERR_DIR_LISTING 2014-03-09 01:47:40.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

Directory: %U/

Directory Content:

%z
%g
Parent Directory (Root Directory)
\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_DNS_FAIL squid-3.4.4.1/errors/en/ERR_DNS_FAIL --- squid-3.4.4/errors/en/ERR_DNS_FAIL 2014-03-09 01:47:40.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unable to determine IP address from host name %H

The DNS server returned:

%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ESI squid-3.4.4.1/errors/en/ERR_ESI --- squid-3.4.4/errors/en/ERR_ESI 2014-03-09 01:47:41.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ESI Processing failed.

The ESI processor returned:

%Z

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

Your webmaster is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/en/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/en/ERR_FORWARDING_DENIED 2014-03-09 01:47:42.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Forwarding Denied.

This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_DISABLED squid-3.4.4.1/errors/en/ERR_FTP_DISABLED --- squid-3.4.4/errors/en/ERR_FTP_DISABLED 2014-03-09 01:47:42.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

FTP is Disabled

This cache does not support FTP.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_FAILURE squid-3.4.4.1/errors/en/ERR_FTP_FAILURE --- squid-3.4.4/errors/en/ERR_FTP_FAILURE 2014-03-09 01:47:43.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

An FTP protocol error occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/en/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/en/ERR_FTP_FORBIDDEN 2014-03-09 01:47:43.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

An FTP authentication failure occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/en/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/en/ERR_FTP_NOT_FOUND 2014-03-09 01:47:44.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following URL could not be retrieved: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/en/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/en/ERR_FTP_PUT_CREATED 2014-03-09 01:47:45.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operation successful

File created


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/en/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/en/ERR_FTP_PUT_ERROR 2014-03-09 01:47:45.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: FTP upload failed

ERROR

FTP PUT upload failed

An FTP protocol error occurred while trying to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/en/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/en/ERR_FTP_PUT_MODIFIED 2014-03-09 01:47:46.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

Operation successful

File updated


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/en/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/en/ERR_FTP_UNAVAILABLE 2014-03-09 01:47:46.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The FTP server was too busy to retrieve the URL: %U

Squid sent the following FTP command:

%f

The server responded with:

%F
%g

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/en/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/en/ERR_GATEWAY_FAILURE 2014-03-09 01:47:47.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Gateway Proxy Failure

A non-recoverable internal failure or configuration problem prevents this request from being completed.

This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ICAP_FAILURE squid-3.4.4.1/errors/en/ERR_ICAP_FAILURE --- squid-3.4.4/errors/en/ERR_ICAP_FAILURE 2014-03-09 01:47:48.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

ICAP protocol error.

The system returned: %E

This means that some aspect of the ICAP communication failed.

Some possible problems are:

  • The ICAP server is not reachable.

  • An Illegal response was received from the ICAP server.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_INVALID_REQ squid-3.4.4.1/errors/en/ERR_INVALID_REQ --- squid-3.4.4/errors/en/ERR_INVALID_REQ 2014-03-09 01:47:48.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Request error was encountered while trying to process the request:

%R

Some possible problems are:

  • Missing or unknown request method.

  • Missing URL.

  • Missing HTTP Identifier (HTTP/1.0).

  • Request is too large.

  • Content-Length missing for POST or PUT requests.

  • Illegal character in hostname; underscores are not allowed.

  • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_INVALID_RESP squid-3.4.4.1/errors/en/ERR_INVALID_RESP --- squid-3.4.4/errors/en/ERR_INVALID_RESP 2014-03-09 01:47:49.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

Invalid Response error was encountered while trying to process the request:

%R

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_INVALID_URL squid-3.4.4.1/errors/en/ERR_INVALID_URL --- squid-3.4.4/errors/en/ERR_INVALID_URL 2014-03-09 01:47:49.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Invalid URL

Some aspect of the requested URL is incorrect.

Some possible problems are:

  • Missing or incorrect access protocol (should be http:// or similar)

  • Missing hostname

  • Illegal double-escape in the URL-Path

  • Illegal character in hostname; underscores are not allowed.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_LIFETIME_EXP squid-3.4.4.1/errors/en/ERR_LIFETIME_EXP --- squid-3.4.4/errors/en/ERR_LIFETIME_EXP 2014-03-09 01:47:50.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Connection Lifetime Expired

Squid has terminated the request because it has exceeded the maximum connection lifetime.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_NO_RELAY squid-3.4.4.1/errors/en/ERR_NO_RELAY --- squid-3.4.4/errors/en/ERR_NO_RELAY 2014-03-09 01:47:50.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

No Wais Relay

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/en/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/en/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:47:51.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Valid document was not found in the cache and only-if-cached directive was specified.

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/error-details.txt squid-3.4.4.1/errors/en/error-details.txt --- squid-3.4.4/errors/en/error-details.txt 2014-03-09 01:47:58.000000000 -0800 +++ squid-3.4.4.1/errors/en/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/en/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/en/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/en/ERR_PRECONDITION_FAILED 2014-03-09 01:47:52.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Precondition Failed.

This means:

At least one precondition specified by the HTTP client in the request header has failed.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_READ_ERROR squid-3.4.4.1/errors/en/ERR_READ_ERROR --- squid-3.4.4/errors/en/ERR_READ_ERROR 2014-03-09 01:47:52.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Read Error

The system returned: %E

An error condition occurred while reading data from the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_READ_TIMEOUT squid-3.4.4.1/errors/en/ERR_READ_TIMEOUT --- squid-3.4.4/errors/en/ERR_READ_TIMEOUT 2014-03-09 01:47:53.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Read Timeout

The system returned: %E

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/en/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/en/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:47:53.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Failed to establish a secure connection to %I

The system returned:

%E (TLS code: %x)

%D

This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/en/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/en/ERR_SHUTTING_DOWN 2014-03-09 01:47:54.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/en/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/en/ERR_SOCKET_FAILURE 2014-03-09 01:47:54.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Socket Failure

The system returned: %E

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_TOO_BIG squid-3.4.4.1/errors/en/ERR_TOO_BIG --- squid-3.4.4/errors/en/ERR_TOO_BIG 2014-03-09 01:47:55.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

The request or reply is too large.

If you are making a POST or PUT request, then the item you are trying to upload is too large.

If you are making a GET request, then the item you are trying to download is too large.

These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/en/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/en/ERR_UNSUP_HTTPVERSION 2014-03-09 01:47:56.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

Unsupported HTTP version

The following error was encountered while trying to retrieve the URL: %U

Unsupported HTTP version

This Squid does not accept the HTTP version you are attempting to use.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_UNSUP_REQ squid-3.4.4.1/errors/en/ERR_UNSUP_REQ --- squid-3.4.4/errors/en/ERR_UNSUP_REQ 2014-03-09 01:47:56.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Unsupported Request Method and Protocol

Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_URN_RESOLVE squid-3.4.4.1/errors/en/ERR_URN_RESOLVE --- squid-3.4.4/errors/en/ERR_URN_RESOLVE 2014-03-09 01:47:57.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

ERROR

A URL for the requested URN could not be retrieved

The following error was encountered while trying to retrieve the URN: %U

Cannot Resolve URN

Hey, don't expect too much from URNs on %T :)

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_WRITE_ERROR squid-3.4.4.1/errors/en/ERR_WRITE_ERROR --- squid-3.4.4/errors/en/ERR_WRITE_ERROR 2014-03-09 01:47:57.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Write Error

The system returned: %E

An error condition occurred while writing to the network. Please retry your request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/en/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/en/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/en/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:47:58.000000000 -0800 +++ squid-3.4.4.1/errors/en/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

ERROR

The requested URL could not be retrieved

The following error was encountered while trying to retrieve the URL: %U

Zero Sized Reply

Squid did not receive any data for this request.

Your cache administrator is %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ACCESS_DENIED squid-3.4.4.1/errors/es/ERR_ACCESS_DENIED --- squid-3.4.4/errors/es/ERR_ACCESS_DENIED 2014-03-09 01:47:59.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

ERROR

El URL solicitado no se ha podido conseguir

Se encontró el siguiente error al intentar recuperar la dirección URL: %U

Acceso Denegado

La configuración de control de acceso evita que su solicitud sea permitida en este momento. Por favor, póngase en contacto con su proveedor de servicios si cree que esto es incorrecto.

Su administrador del caché es %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:47:59.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

ERROR

El URL solicitado no se ha podido conseguir

Se encontró el siguiente error al intentar recuperar la dirección URL: %U

Time Quota Exceeded.

This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

Estos límites han sido establecidos por el proveedor de servicios de Internet que opera este caché. Por favor, comuníquese con ellos directamente si cree que esto es un error

Su administrador del caché es %w.


\ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/es/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/es/ERR_AGENT_CONFIGURE 2014-03-09 01:48:00.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuración del Navegador de Internet

ERROR

Web Browser Configuration

Su configuración de Navegador de Internet necesita ser corregida para usar esta red.

Como encontrar estas preferencias en su navegador:

Para navegadores basados en Firefox vaya a:
  • Herramientas -> Opciones -> Avanzado -> Red -> Ajustes de conexión
  • In the HTTP proxy box type the proxy name %h and port %b.
    • Para navegadores Internet Explorer vaya a:
  • Herramientas -> Opciones de Internet -> Conexión -> Preferencias de RED ->Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.
    • Para navegadores Opera vaya a:
  • Herramientas -> Opciones -> Avanzado -> Red -> Servidores Proxy
  • In the HTTP proxy box type the proxy name %h and port %b.

    • Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_AGENT_WPAD squid-3.4.4.1/errors/es/ERR_AGENT_WPAD --- squid-3.4.4/errors/es/ERR_AGENT_WPAD 2014-03-09 01:48:00.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuración del Navegador de Internet

    ERROR

    Web Browser Configuration

    Su configuración de Navegador de Internet necesita ser corregida para usar esta red.

    Como encontrar estas preferencias en su navegador:

    Para navegadores basados en Firefox vaya a:
  • Herramientas -> Opciones -> Avanzado -> Red -> Ajustes de conexión
  • Select Auto-detect proxy settings for this network
    • Para navegadores Internet Explorer vaya a:
  • Herramientas -> Opciones de Internet -> Conexión -> Preferencias de RED ->Proxy
  • Seleccione Detectar preferencias automáticamente
    • Para navegadores Opera vaya a:
  • Herramientas -> Opciones -> Avanzado -> Red -> Servidores Proxy
  • Seleccione Usar Configuración automática de Proxy

    • Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/es/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/es/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:48:01.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Acceso Denegado a la Caché

    ERROR

    Cache Acceso Denegado

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Acceso Denegado a la Caché

    Lo lamento, tu no estás autorizado a solicitar %U de este caché hasta que te hayas autenticado.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/es/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/es/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:48:02.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Acceso Denegado al Caché Manager

    ERROR

    Cache Manager Acceso Denegado

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Acceso Denegado al Cache Manager.

    Lo lamento, tu no estás autorizado a solicitar %U de este gestor de caché hasta que te hayas autenticado.

    Por favor contacte al administrador del caché si tiene dificultad para autenticarse, o si Ud. es el administrador, lea la documentación de Squid sobre interfaz del cache manager y chequee en el log de caché mensajes de error más detallados.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/es/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/es/ERR_CANNOT_FORWARD 2014-03-09 01:48:02.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Imposibilidad de enviar la petición en este momento.

    This request could not be forwarded to the origin server or to any parent caches.

    Algunos posibles problemas son:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_CONFLICT_HOST squid-3.4.4.1/errors/es/ERR_CONFLICT_HOST --- squid-3.4.4/errors/es/ERR_CONFLICT_HOST 2014-03-09 01:48:03.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Algunos posibles problemas son:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_CONNECT_FAIL squid-3.4.4.1/errors/es/ERR_CONNECT_FAIL --- squid-3.4.4/errors/es/ERR_CONNECT_FAIL 2014-03-09 01:48:03.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Conexión a %I fallida.

    El sistema ha devuelto: %E

    El host remoto o la red se ha caído. Por favor, inténtelo de nuevo la petición.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_DIR_LISTING squid-3.4.4.1/errors/es/ERR_DIR_LISTING --- squid-3.4.4/errors/es/ERR_DIR_LISTING 2014-03-09 01:48:04.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directorio: %U

    Directorio: %U/

    Contenido del Directorio:

    %z
    %g
    Directorio superior (Directorio Raiz)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_DNS_FAIL squid-3.4.4.1/errors/es/ERR_DNS_FAIL --- squid-3.4.4/errors/es/ERR_DNS_FAIL 2014-03-09 01:48:04.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Incapaz de determinar la dirección IP a partir del nombre de la máquina %H

    El servidor DNS devolvió:

    %z

    Esto significa que el caché no ha sido capaz de resolver el nombre de máquina presente en la URL. Compruebe que la dirección sea correcta.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ESI squid-3.4.4.1/errors/es/ERR_ESI --- squid-3.4.4/errors/es/ERR_ESI 2014-03-09 01:48:05.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    El procesado ESI falló

    El procesador ESI devolvió:

    %Z

    Esto significa que el sustituto no fue capaz de procesar la plantilla ESI. Por favor, informe de este error al administrador web.

    Su administrador web es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/es/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/es/ERR_FORWARDING_DENIED 2014-03-09 01:48:06.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Reenvío denegado.

    Este caché no transmitirá su solicitud, ya que intenta imponer una relación de conexión. Quizás el cliente en% i es un caché que se ha desconfigurado.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_DISABLED squid-3.4.4.1/errors/es/ERR_FTP_DISABLED --- squid-3.4.4/errors/es/ERR_FTP_DISABLED 2014-03-09 01:48:06.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Servicio FTP deshabilitado

    Esta caché no soporta FTP.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_FAILURE squid-3.4.4.1/errors/es/ERR_FTP_FAILURE --- squid-3.4.4/errors/es/ERR_FTP_FAILURE 2014-03-09 01:48:07.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se ha producido un error del protocolo FTP mientras se intentaba acceder a la URL: %U

    Squid ha enviado el siguiente comando FTP:

    %f

    El servidor ha respondido con:

    %F
    %g

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/es/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/es/ERR_FTP_FORBIDDEN 2014-03-09 01:48:08.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Ha ocurrido una falla de autenticación cuando se trataba de conseguir el URL: %U

    Squid ha enviado el siguiente comando FTP:

    %f

    El servidor ha respondido con:

    %F
    %g

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/es/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/es/ERR_FTP_NOT_FOUND 2014-03-09 01:48:08.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    El siguiente URL no pudo ser obtenido: %U

    Squid ha enviado el siguiente comando FTP:

    %f

    El servidor ha respondido con:

    %F
    %g

    Esto podria ser causado por una URL del FTP con ruta absoluta (La cual no cumple con el RFC 1738). si esto es la causa, entonces el archivo puede ser buscado en %B.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/es/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/es/ERR_FTP_PUT_CREATED 2014-03-09 01:48:09.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - PUT FTP realizado con éxito

    Operación éxitoso

    Archivo creado


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/es/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/es/ERR_FTP_PUT_ERROR 2014-03-09 01:48:09.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: falla en envio FTP

    ERROR

    FTP PUT fallido

    Se ha producido un error del protocolo FTP mientras se intentaba acceder a la URL: %U

    Squid ha enviado el siguiente comando FTP:

    %f

    El servidor ha respondido con:

    %F

    Esto significa que el servidor FTP puede que no tenga permiso o espacio para almacenar el archivo. Compruebe la ruta, permisos, espacio en disco y vuelva a intentarlo.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/es/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/es/ERR_FTP_PUT_MODIFIED 2014-03-09 01:48:10.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - PUT FTP realizado con éxito

    Operación éxitoso

    Archivo actualizado


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/es/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/es/ERR_FTP_UNAVAILABLE 2014-03-09 01:48:10.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    El servidor FTP estaba demasiado ocupado para recuperar la URL: %U

    Squid ha enviado el siguiente comando FTP:

    %f

    El servidor ha respondido con:

    %F
    %g

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/es/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/es/ERR_GATEWAY_FAILURE 2014-03-09 01:48:11.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ICAP_FAILURE squid-3.4.4.1/errors/es/ERR_ICAP_FAILURE --- squid-3.4.4/errors/es/ERR_ICAP_FAILURE 2014-03-09 01:48:12.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Error de protocolo ICAP.

    El sistema ha devuelto: %E

    Esto significa que falló algún aspecto de la comunicación ICAP.

    Algunos posibles problemas son:

    • El servidor ICAP no es alcanzable.

    • Se ha recibido una respuesta ilegal desde el servidor ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_INVALID_REQ squid-3.4.4.1/errors/es/ERR_INVALID_REQ --- squid-3.4.4/errors/es/ERR_INVALID_REQ 2014-03-09 01:48:12.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Petición Incorrecta se ha encontrado un error mientras se intentaba procesar la petición:

    %R

    Algunos posibles problemas son:

    • Falta o es desconocido el método de la petición (no es GET ni POST)

    • URL Perdido.

    • Falta el identificador HTTP (HTTP/1.0)

    • La petición es demasiado grande.

    • Falta Content-Length en las peticiones POST o PUT

    • Hay caracteres ilegales en el nombre de máquina; el carácter subrayado (_) no está permitido.

    • HTTP/1.1 Esperado: la característica ha sido requerida desde un software HTTP/1.0.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_INVALID_RESP squid-3.4.4.1/errors/es/ERR_INVALID_RESP --- squid-3.4.4/errors/es/ERR_INVALID_RESP 2014-03-09 01:48:13.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Respuesta Incorrecta se ha encontrado un error mientras se intentaba procesar la petición:

    %R

    El mensaje de Respuesta HTTP recibido del servidor contactado no pudo ser entendido o tenía alguna malformación. Por favor contacte al operador del sitio.

    Quizas su administrador del caché pueda darle a Ud. más detalles acerca de la naturaleza exacta del problema en caso de ser necesario.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_INVALID_URL squid-3.4.4.1/errors/es/ERR_INVALID_URL --- squid-3.4.4/errors/es/ERR_INVALID_URL 2014-03-09 01:48:13.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    URL Inválida

    Algún aspecto del URL solicitado es incorrecto.

    Algunos posibles problemas son:

    • Falta o es incorrecto el protocolo de acceso (debe ser http:// o similar)

    • Falta el nombre de la máquina

    • Hay un doble-escape ilegal en la ruta de la URL

    • Hay caracteres ilegales en el nombre de máquina; el carácter subrayado (_) no está permitido.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_LIFETIME_EXP squid-3.4.4.1/errors/es/ERR_LIFETIME_EXP --- squid-3.4.4/errors/es/ERR_LIFETIME_EXP 2014-03-09 01:48:14.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Ha expirado el tiempo de vida de la conexión

    Squid ha dado por terminada la petición porque se ha excedido el tiempo de vida máximo para una conexión.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_NO_RELAY squid-3.4.4.1/errors/es/ERR_NO_RELAY --- squid-3.4.4/errors/es/ERR_NO_RELAY 2014-03-09 01:48:14.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    No hay una pasarela para protocolo Wais.

    No esta definido el host wais relay para este cache. comentar con el administrador

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/es/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/es/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:48:15.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    No se encontró un documento válido en el caché y se especificó la directiva only-if-cached.

    Ud. ha enviado una solicitud con la directiva de control del caché only-if-cached. El documento no fue encontrado en el caché, o requiere revalidación prohibida por la directiva only-if-cached

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/error-details.txt squid-3.4.4.1/errors/es/error-details.txt --- squid-3.4.4/errors/es/error-details.txt 2014-03-09 01:48:22.000000000 -0800 +++ squid-3.4.4.1/errors/es/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/es/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/es/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/es/ERR_PRECONDITION_FAILED 2014-03-09 01:48:16.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_READ_ERROR squid-3.4.4.1/errors/es/ERR_READ_ERROR --- squid-3.4.4/errors/es/ERR_READ_ERROR 2014-03-09 01:48:16.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Error de Lectura

    El sistema ha devuelto: %E

    Se ha producido un error al leer datos de la red. Por favor, inténtelo de nuevo.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_READ_TIMEOUT squid-3.4.4.1/errors/es/ERR_READ_TIMEOUT --- squid-3.4.4/errors/es/ERR_READ_TIMEOUT 2014-03-09 01:48:17.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Se acabó el tiempo máximo para lectura de datos de la red.

    El sistema ha devuelto: %E

    Un tiempo de espera se produjo mientras se esperaba leer datos de la red. La red o el servidor puede estar caído o congestionado. Por favor, inténtelo de nuevo.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/es/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/es/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:48:17.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    No se ha podido establecer una conexión segura con %I

    The system returned:

    %E (TLS code: %x)

    %D

    Este proxy y el host remoto no han podido negociar una confguración de seguridad aceptable mutua para manejar su solicitud. Es posible que el host remoto sea incompatible con conexiones seguras, o el proxy no esté satisfecho con las credenciales de seguridad del host.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/es/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/es/ERR_SHUTTING_DOWN 2014-03-09 01:48:18.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Este caché está en el proceso de apagado y no puede atender su solicitud en este momento. Por favor, inténtelo de nuevo pronto.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/es/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/es/ERR_SOCKET_FAILURE 2014-03-09 01:48:18.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Fallo en el puerto (socket)

    El sistema ha devuelto: %E

    Squid no ha sido capaz de crear un socket TCP, probablemente debido a una carga excesiva. Por favor reintenta tu petición.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_TOO_BIG squid-3.4.4.1/errors/es/ERR_TOO_BIG --- squid-3.4.4/errors/es/ERR_TOO_BIG 2014-03-09 01:48:19.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    La petición o la respuesta es demasiado larga.

    Si está haciendo una petición POST o PUT, lo que está intentando subir es demasiado grande.

    Si está haciendo una petición GET, entonces que está tratando de bajar es demasiado grande.

    Estos límites han sido establecidos por el proveedor de servicios de Internet que opera este caché. Por favor, comuníquese con ellos directamente si cree que esto es un error

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/es/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/es/ERR_UNSUP_HTTPVERSION 2014-03-09 01:48:19.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    Version HTTP no soportada

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Unsupported HTTP version

    Este Squid no acepta la version HTTP que tu estas pretendiendo usar.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_UNSUP_REQ squid-3.4.4.1/errors/es/ERR_UNSUP_REQ --- squid-3.4.4/errors/es/ERR_UNSUP_REQ 2014-03-09 01:48:20.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Método de la petición y protocolo no soportados.

    Squid no admite todos los métodos para todos los protocolos de acceso. Por ejemplo, no se puede hacer un POST a un servidor Gopher.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_URN_RESOLVE squid-3.4.4.1/errors/es/ERR_URN_RESOLVE --- squid-3.4.4/errors/es/ERR_URN_RESOLVE 2014-03-09 01:48:21.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: La URN requerida no pudo ser obtenida.

    ERROR

    No se ha podido obtener una URL para el URN solicitado

    Se encontró el siguiente error al intentar recuperar la dirección URN: %U

    No se puede resolver el URN

    Hey, no espere mucho de URNs en %T :)

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_WRITE_ERROR squid-3.4.4.1/errors/es/ERR_WRITE_ERROR --- squid-3.4.4/errors/es/ERR_WRITE_ERROR 2014-03-09 01:48:21.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Error de Escritura

    El sistema ha devuelto: %E

    Se ha producido un error al escribir datos de la red. Por favor, inténtelo de nuevo.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/es/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/es/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/es/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:48:22.000000000 -0800 +++ squid-3.4.4.1/errors/es/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    El URL solicitado no se ha podido conseguir

    Se encontró el siguiente error al intentar recuperar la dirección URL: %U

    Respuesta vacía (tamaño cero)

    Squid no ha recibido ninguna información en respuesta a esta petición.

    Su administrador del caché es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ACCESS_DENIED squid-3.4.4.1/errors/et/ERR_ACCESS_DENIED --- squid-3.4.4/errors/et/ERR_ACCESS_DENIED 2014-03-09 01:48:22.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Juurdepääs keelatud.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:48:23.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/et/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/et/ERR_AGENT_CONFIGURE 2014-03-09 01:48:23.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    VIGA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_AGENT_WPAD squid-3.4.4.1/errors/et/ERR_AGENT_WPAD --- squid-3.4.4/errors/et/ERR_AGENT_WPAD 2014-03-09 01:48:24.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    VIGA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/et/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/et/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:48:24.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Cache Access Denied

    ERROR

    Cache Juurdepääs keelatud.

    The following error was encountered while trying to retrieve the URL: %U

    Vahemälu serveri kasutamine keelatud.

    abandust, teil pole õigust päringule %U kuni te pole läbinud autoriseerimist.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/et/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/et/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:48:25.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Cache Manager Access Denied

    ERROR

    Cache Manager Juurdepääs keelatud.

    The following error was encountered while trying to retrieve the URL: %U

    Vahemälu serveri haldaja kasutamine keelatud.

    Vabandust, teil pole õigust päringule %U sellele vahemälu serveri haldajale, kuni te pole läbinud autoriseerimist.

    Palun kontakteeruge vahemälu serveri administraatoriga,kui teil on probleeme autoriseerimisega või kui te oleteadministraator, lugege Squidi dokumentatsiooni vahemälu serveri haldaja interfeisi kohtaja kontrollige vahemälu serveri logi täpsema veakirjelduse saamiseks.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/et/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/et/ERR_CANNOT_FORWARD 2014-03-09 01:48:26.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Päringu edastamine ebaõnnestus.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_CONFLICT_HOST squid-3.4.4.1/errors/et/ERR_CONFLICT_HOST --- squid-3.4.4/errors/et/ERR_CONFLICT_HOST 2014-03-09 01:48:26.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_CONNECT_FAIL squid-3.4.4.1/errors/et/ERR_CONNECT_FAIL --- squid-3.4.4/errors/et/ERR_CONNECT_FAIL 2014-03-09 01:48:27.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    Süsteem vastas: %E

    The remote host or network may be down. Please try the request again.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_DIR_LISTING squid-3.4.4.1/errors/et/ERR_DIR_LISTING --- squid-3.4.4/errors/et/ERR_DIR_LISTING 2014-03-09 01:48:27.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_DNS_FAIL squid-3.4.4.1/errors/et/ERR_DNS_FAIL --- squid-3.4.4/errors/et/ERR_DNS_FAIL 2014-03-09 01:48:28.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Ei õnnestu saada hosti %H nimele vastavat IP aadressi

    DNS server vastas:

    %z

    Mis tähendab vahemälu server ei suutnud lahendada URLis antud hosti nime. Palun kontrollige aadressi korrektsust.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ESI squid-3.4.4.1/errors/et/ERR_ESI --- squid-3.4.4/errors/et/ERR_ESI 2014-03-09 01:48:29.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/et/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/et/ERR_FORWARDING_DENIED 2014-03-09 01:48:29.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Edastamine keelatud.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_DISABLED squid-3.4.4.1/errors/et/ERR_FTP_DISABLED --- squid-3.4.4/errors/et/ERR_FTP_DISABLED 2014-03-09 01:48:30.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP on blokeeritud

    See vahemälu server ei toeta FTPd.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_FAILURE squid-3.4.4.1/errors/et/ERR_FTP_FAILURE --- squid-3.4.4/errors/et/ERR_FTP_FAILURE 2014-03-09 01:48:30.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid saatis järgneva FTP käsu:

    %f

    The server responded with:

    %F
    %g

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/et/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/et/ERR_FTP_FORBIDDEN 2014-03-09 01:48:31.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid saatis järgneva FTP käsu:

    %f

    The server responded with:

    %F
    %g

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/et/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/et/ERR_FTP_NOT_FOUND 2014-03-09 01:48:31.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid saatis järgneva FTP käsu:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/et/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/et/ERR_FTP_PUT_CREATED 2014-03-09 01:48:32.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation õnnestus

    Fail on loodud


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/et/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/et/ERR_FTP_PUT_ERROR 2014-03-09 01:48:32.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: FTP upload failed

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid saatis järgneva FTP käsu:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/et/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/et/ERR_FTP_PUT_MODIFIED 2014-03-09 01:48:33.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation õnnestus

    Fail on uuendatud


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/et/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/et/ERR_FTP_UNAVAILABLE 2014-03-09 01:48:34.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid saatis järgneva FTP käsu:

    %f

    The server responded with:

    %F
    %g

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/et/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/et/ERR_GATEWAY_FAILURE 2014-03-09 01:48:34.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ICAP_FAILURE squid-3.4.4.1/errors/et/ERR_ICAP_FAILURE --- squid-3.4.4/errors/et/ERR_ICAP_FAILURE 2014-03-09 01:48:35.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    Süsteem vastas: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_INVALID_REQ squid-3.4.4.1/errors/et/ERR_INVALID_REQ --- squid-3.4.4/errors/et/ERR_INVALID_REQ 2014-03-09 01:48:36.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Puudub või tundmatu päringu meetod (GET, POST)

    • Puudub URL

    • Puudub HTTP identifikaator (HTTP/1.0)

    • Päring võib olla liiga suur

    • POST või PUT päringutel puudub Content-Length

    • keelatud sümbolid hosti nimes; alakriipsud pole lubatud

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_INVALID_RESP squid-3.4.4.1/errors/et/ERR_INVALID_RESP --- squid-3.4.4/errors/et/ERR_INVALID_RESP 2014-03-09 01:48:36.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    Vasti võetud HTTP vastus on tundmatu või muidu katki. Palun kontakteeruge saidi operaatoriga.

    Teie vehemälu serveri administraator võib saada anda täiendavat infot selle vea detailide kohta.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_INVALID_URL squid-3.4.4.1/errors/et/ERR_INVALID_URL --- squid-3.4.4/errors/et/ERR_INVALID_URL 2014-03-09 01:48:37.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Vigane URL

    Mõni osa URList on vigane.

    Some possible problems are:

    • Puuduv või vigane protokoll (peaks olema http:// või sarnane)

    • Puuduv hosti nimi

    • Vigane topelt-kaldkriips URLi teel

    • keelatud sümbolid hosti nimes; alakriipsud pole lubatud

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_LIFETIME_EXP squid-3.4.4.1/errors/et/ERR_LIFETIME_EXP --- squid-3.4.4/errors/et/ERR_LIFETIME_EXP 2014-03-09 01:48:38.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Ühenduse eluaeg lõppes

    Squid katkestas päringu, kuna see kestis liiga kaua.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_NO_RELAY squid-3.4.4.1/errors/et/ERR_NO_RELAY --- squid-3.4.4/errors/et/ERR_NO_RELAY 2014-03-09 01:48:38.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Wais edastaja puudub

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/et/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/et/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:48:39.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Kehtiv dokument puudub vahemälu serverist ja päring sisaldas only-if-cached direktiivi.

    Te edastasite päringu only-if-cached vahemälu kontrolli direktiiviga. Dokumenti ei leitud vahemälu serverist võita nõudis uuendamist, mis on aga keelatud only-if-cached direktiiviga.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/error-details.txt squid-3.4.4.1/errors/et/error-details.txt --- squid-3.4.4/errors/et/error-details.txt 2014-03-09 01:48:46.000000000 -0800 +++ squid-3.4.4.1/errors/et/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/et/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/et/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/et/ERR_PRECONDITION_FAILED 2014-03-09 01:48:39.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_READ_ERROR squid-3.4.4.1/errors/et/ERR_READ_ERROR --- squid-3.4.4/errors/et/ERR_READ_ERROR 2014-03-09 01:48:40.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Viga lugemisel

    Süsteem vastas: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_READ_TIMEOUT squid-3.4.4.1/errors/et/ERR_READ_TIMEOUT --- squid-3.4.4/errors/et/ERR_READ_TIMEOUT 2014-03-09 01:48:41.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lugeja kannatus katkes

    Süsteem vastas: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/et/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/et/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:48:41.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/et/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/et/ERR_SHUTTING_DOWN 2014-03-09 01:48:42.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/et/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/et/ERR_SOCKET_FAILURE 2014-03-09 01:48:42.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Pistiku viga

    Süsteem vastas: %E

    Squid ei suuda tekitada TCP pistikut, ilmselt ülekoormuse tõttu. Palun korrake päringut.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_TOO_BIG squid-3.4.4.1/errors/et/ERR_TOO_BIG --- squid-3.4.4/errors/et/ERR_TOO_BIG 2014-03-09 01:48:43.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Päring või vastus on liiga suur.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/et/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/et/ERR_UNSUP_HTTPVERSION 2014-03-09 01:48:43.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_UNSUP_REQ squid-3.4.4.1/errors/et/ERR_UNSUP_REQ --- squid-3.4.4/errors/et/ERR_UNSUP_REQ 2014-03-09 01:48:44.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Tundmatu päringu meetod ja protokoll

    Squid ei toeta kõiki päringu meetodeid kõikide protokollidega. Näiteks, te ei saa teha POST operatsiooni Gopher päringus.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_URN_RESOLVE squid-3.4.4.1/errors/et/ERR_URN_RESOLVE --- squid-3.4.4/errors/et/ERR_URN_RESOLVE 2014-03-09 01:48:45.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: The requested URN could not be retrieved

    ERROR

    Päring URNile ei saa vastust

    The following error was encountered while trying to retrieve the URN: %U

    Ei suuda lahendada URN

    Hei, mida sa ootad URNidelt %T peal:)

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_WRITE_ERROR squid-3.4.4.1/errors/et/ERR_WRITE_ERROR --- squid-3.4.4/errors/et/ERR_WRITE_ERROR 2014-03-09 01:48:45.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Viga kirjutamisel

    Süsteem vastas: %E

    An error condition occurred while writing to the network. Please retry your request.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/et/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/et/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/et/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:48:46.000000000 -0800 +++ squid-3.4.4.1/errors/et/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIGA: Päring URLile ei saa vastust

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Vastus on tühi

    Squid ei saanud selle päringu vastuseks midagi.

    Teie teenusepakkuja aadress on %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ACCESS_DENIED squid-3.4.4.1/errors/fa/ERR_ACCESS_DENIED --- squid-3.4.4/errors/fa/ERR_ACCESS_DENIED 2014-03-09 01:48:46.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    دسترسی رد شد.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:48:47.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/fa/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/fa/ERR_AGENT_CONFIGURE 2014-03-09 01:48:47.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    خطا

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_AGENT_WPAD squid-3.4.4.1/errors/fa/ERR_AGENT_WPAD --- squid-3.4.4/errors/fa/ERR_AGENT_WPAD 2014-03-09 01:48:48.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    خطا

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/fa/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/fa/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:48:48.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: Cache Access Denied

    ERROR

    Cache دسترسی رد شد.

    The following error was encountered while trying to retrieve the URL: %U

    دسترسی به نهانگاه رد شد.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:48:49.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: Cache Manager Access Denied

    ERROR

    Cache Manager دسترسی رد شد.

    The following error was encountered while trying to retrieve the URL: %U

    دسترسی مدیریت نهانگاه رد شد.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/fa/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/fa/ERR_CANNOT_FORWARD 2014-03-09 01:48:50.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    بعضی از مشکلات احتمالی:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_CONFLICT_HOST squid-3.4.4.1/errors/fa/ERR_CONFLICT_HOST --- squid-3.4.4/errors/fa/ERR_CONFLICT_HOST 2014-03-09 01:48:50.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    بعضی از مشکلات احتمالی:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_CONNECT_FAIL squid-3.4.4.1/errors/fa/ERR_CONNECT_FAIL --- squid-3.4.4/errors/fa/ERR_CONNECT_FAIL 2014-03-09 01:48:51.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    برقراری ارتباط به l% با عدم موفقیت همراه بود.

    The system returned: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_DIR_LISTING squid-3.4.4.1/errors/fa/ERR_DIR_LISTING --- squid-3.4.4/errors/fa/ERR_DIR_LISTING 2014-03-09 01:48:51.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - مسیر : U%

    مسیر: %U/

    محتویات مسیر:

    %z
    %g
    مسیر اصلی (مسیر ریشه)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_DNS_FAIL squid-3.4.4.1/errors/fa/ERR_DNS_FAIL --- squid-3.4.4/errors/fa/ERR_DNS_FAIL 2014-03-09 01:48:52.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    کارگزار DNS برگشت داده‌ : 

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ESI squid-3.4.4.1/errors/fa/ERR_ESI --- squid-3.4.4/errors/fa/ERR_ESI 2014-03-09 01:48:52.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    پردازش ESI با عدم موفقیت همراه بود.

    پردازش ESI برگشت داده:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/fa/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/fa/ERR_FORWARDING_DENIED 2014-03-09 01:48:53.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    امکان Forward بسته شده است.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_DISABLED squid-3.4.4.1/errors/fa/ERR_FTP_DISABLED --- squid-3.4.4/errors/fa/ERR_FTP_DISABLED 2014-03-09 01:48:53.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP قابل دسترس نیست.

    این کارگزار Cache از قرارداد FTP پشتیبانی نمی‌کند.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_FAILURE squid-3.4.4.1/errors/fa/ERR_FTP_FAILURE --- squid-3.4.4/errors/fa/ERR_FTP_FAILURE 2014-03-09 01:48:54.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    یک خطا روی پروتکل FTP در زمان اتصال به آدرس مورد نظر رخ داد.: %U

    اسکویید دستور FTP روبرو را فرستاد:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/fa/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/fa/ERR_FTP_FORBIDDEN 2014-03-09 01:48:55.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    موقع تلاش جهت دسترسی به آدرس مورد نظر عمل شناسایی کاربر بر روی FTP با عدم موفقیت همراه بود. : %U

    اسکویید دستور FTP روبرو را فرستاد:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/fa/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/fa/ERR_FTP_NOT_FOUND 2014-03-09 01:48:55.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    اسکویید دستور FTP روبرو را فرستاد:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/fa/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/fa/ERR_FTP_PUT_CREATED 2014-03-09 01:48:56.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    عملیات موفقیت‌آمیز

    فایل ایجاد شد.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/fa/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/fa/ERR_FTP_PUT_ERROR 2014-03-09 01:48:56.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: FTP upload failed

    ERROR

    FTP PUT upload failed

    یک خطا روی پروتکل FTP در زمان اتصال به آدرس مورد نظر رخ داد.: %U

    اسکویید دستور FTP روبرو را فرستاد:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/fa/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/fa/ERR_FTP_PUT_MODIFIED 2014-03-09 01:48:57.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    عملیات موفقیت‌آمیز

    فایل بروزرسانی شد.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/fa/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/fa/ERR_FTP_UNAVAILABLE 2014-03-09 01:48:57.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    اسکویید دستور FTP روبرو را فرستاد:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/fa/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/fa/ERR_GATEWAY_FAILURE 2014-03-09 01:48:58.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ICAP_FAILURE squid-3.4.4.1/errors/fa/ERR_ICAP_FAILURE --- squid-3.4.4/errors/fa/ERR_ICAP_FAILURE 2014-03-09 01:48:59.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    خطا در قرارداد ICAP

    The system returned: %E

    This means that some aspect of the ICAP communication failed.

    بعضی از مشکلات احتمالی:

    • کارگزار ICAP قابل دسترس نیست.

    • یک جواب نامعتبر از خادم ICAP دریافت شد.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_INVALID_REQ squid-3.4.4.1/errors/fa/ERR_INVALID_REQ --- squid-3.4.4/errors/fa/ERR_INVALID_REQ 2014-03-09 01:48:59.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    درخواست نامعتبر این خطا در زمان پردازش درخواست روی داده بود:

    %R

    بعضی از مشکلات احتمالی:

    • فقدان یا ناشناخته بودن روش درخواست.

    • فقدان نشانی اینترنتی

    • فقدان شناسه HTTP (نسخه 1.0)

    • درخواست بسیار بزرگ است.

    • طول محتویات درخواست برای PUT یا POST کم است.

    • کاراکتر غیرمجاز در نام دستگاه، زیرین خط (ـ) اجازه داده نشده است.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_INVALID_RESP squid-3.4.4.1/errors/fa/ERR_INVALID_RESP --- squid-3.4.4/errors/fa/ERR_INVALID_RESP 2014-03-09 01:49:00.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    پاسخ نامعتبر این خطا در زمان پردازش درخواست روی‌ داده بود:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_INVALID_URL squid-3.4.4.1/errors/fa/ERR_INVALID_URL --- squid-3.4.4/errors/fa/ERR_INVALID_URL 2014-03-09 01:49:00.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    نشانی اینترنتی نامعتبر

    برخی از صُور نشانی اینترنتی درخواست شده ناصحیح است.

    بعضی از مشکلات احتمالی:

    • فقدان یا ناصحیح بودن قرارداد دست‌یابی (باید به فرمhttp:// یا شبیه آن باشد)

    • فقدان hostname

    • ۲ فاصله خالی غیر مجاز در مسیر نشانی اینترنتی

    • کاراکتر غیرمجاز در نام دستگاه، زیرین خط (ـ) اجازه داده نشده است.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_LIFETIME_EXP squid-3.4.4.1/errors/fa/ERR_LIFETIME_EXP --- squid-3.4.4/errors/fa/ERR_LIFETIME_EXP 2014-03-09 01:49:01.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    دوره عمر ارتباط شما به پایان رسید.

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_NO_RELAY squid-3.4.4.1/errors/fa/ERR_NO_RELAY --- squid-3.4.4/errors/fa/ERR_NO_RELAY 2014-03-09 01:49:02.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    عدم رله Wais

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/fa/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/fa/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:49:02.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/error-details.txt squid-3.4.4.1/errors/fa/error-details.txt --- squid-3.4.4/errors/fa/error-details.txt 2014-03-09 01:49:09.000000000 -0800 +++ squid-3.4.4.1/errors/fa/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/fa/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/fa/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/fa/ERR_PRECONDITION_FAILED 2014-03-09 01:49:03.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_READ_ERROR squid-3.4.4.1/errors/fa/ERR_READ_ERROR --- squid-3.4.4/errors/fa/ERR_READ_ERROR 2014-03-09 01:49:03.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    خطا در خواندن

    The system returned: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_READ_TIMEOUT squid-3.4.4.1/errors/fa/ERR_READ_TIMEOUT --- squid-3.4.4/errors/fa/ERR_READ_TIMEOUT 2014-03-09 01:49:04.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    سپری شدن زمان مجاز خواندن

    The system returned: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/fa/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/fa/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:49:05.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ایجاد یک ارتباط امن به I% با عدم موفقیت همراه بود.

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/fa/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/fa/ERR_SHUTTING_DOWN 2014-03-09 01:49:05.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/fa/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/fa/ERR_SOCKET_FAILURE 2014-03-09 01:49:06.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    خرابی سوکت

    The system returned: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_TOO_BIG squid-3.4.4.1/errors/fa/ERR_TOO_BIG --- squid-3.4.4/errors/fa/ERR_TOO_BIG 2014-03-09 01:49:06.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    اگر شما یک درخواست PUT یا POST دارید، موردی که شما در تلاش برای بارگذاری هستید بسیار بزرگ است.

    اگر شما یک درخواست GET دارید، موردی که شما در تلاش برای دریافت آن هستید بسیار بزرگ است.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/fa/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/fa/ERR_UNSUP_HTTPVERSION 2014-03-09 01:49:07.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    نسخه HTTP پشتیبانی نشده

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_UNSUP_REQ squid-3.4.4.1/errors/fa/ERR_UNSUP_REQ --- squid-3.4.4/errors/fa/ERR_UNSUP_REQ 2014-03-09 01:49:07.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    روش پشتیبانی‌نشده درخواست و قرارداد

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_URN_RESOLVE squid-3.4.4.1/errors/fa/ERR_URN_RESOLVE --- squid-3.4.4/errors/fa/ERR_URN_RESOLVE 2014-03-09 01:49:08.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URN could not be retrieved

    ERROR

    آدرسی برای URN درخواست شده موجود نبود.

    The following error was encountered while trying to retrieve the URN: %U

    عدم توانایی در ترجمه URN.

    آهای، انتظار زیادی از URNها بر روی T% نداشته باش :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_WRITE_ERROR squid-3.4.4.1/errors/fa/ERR_WRITE_ERROR --- squid-3.4.4/errors/fa/ERR_WRITE_ERROR 2014-03-09 01:49:08.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    خطا در نوشتن

    The system returned: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fa/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/fa/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/fa/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:49:09.000000000 -0800 +++ squid-3.4.4.1/errors/fa/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - خطا: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid did not receive any data for this request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ACCESS_DENIED squid-3.4.4.1/errors/fi/ERR_ACCESS_DENIED --- squid-3.4.4/errors/fi/ERR_ACCESS_DENIED 2014-03-09 01:49:10.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Pääsy evätty.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:49:10.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/fi/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/fi/ERR_AGENT_CONFIGURE 2014-03-09 01:49:11.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    VIRHE

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_AGENT_WPAD squid-3.4.4.1/errors/fi/ERR_AGENT_WPAD --- squid-3.4.4/errors/fi/ERR_AGENT_WPAD 2014-03-09 01:49:11.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    VIRHE

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/fi/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/fi/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:49:12.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Cache Access Denied

    ERROR

    Cache Pääsy evätty.

    The following error was encountered while trying to retrieve the URL: %U

    Pääsy välityspalvelimeen evätty.

    Sinulla ei tällä hetkellä ole oikeutta pyytää osoitetta %U tästä välityspalvelimesta ennen kuin olet todentanut henkilöllisyytesi.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:49:12.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Cache Manager Access Denied

    ERROR

    Cache Manager Pääsy evätty.

    The following error was encountered while trying to retrieve the URL: %U

    Pääsy välityspalvelimen hallintaan evätty.

    Sinulla ei tällä hetkellä ole oikeutta pyytää osoitetta %U tästä välityspalvelimen hallinnasta ennen kuin olet osoittanut henkilöllisyytesi.

    Jos sinulla on hankaluuksia hekilöllisyytesi osoittamisessa, ota yhteyttä välityspalvelimen ylläpitoon tai jos sinä olet ylläpitäjä, lue Squidin dokumentaatiosta välityspalvelimen hallinnan käyttöliittymästä ja tarkista välityspalvelimen lokista tarkemmat virheilmoitukset.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/fi/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/fi/ERR_CANNOT_FORWARD 2014-03-09 01:49:13.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Pyyntöä ei voitu edelleenohjata.

    This request could not be forwarded to the origin server or to any parent caches.

    Mahdollisia ongelmia:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_CONFLICT_HOST squid-3.4.4.1/errors/fi/ERR_CONFLICT_HOST --- squid-3.4.4/errors/fi/ERR_CONFLICT_HOST 2014-03-09 01:49:13.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Mahdollisia ongelmia:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_CONNECT_FAIL squid-3.4.4.1/errors/fi/ERR_CONNECT_FAIL --- squid-3.4.4/errors/fi/ERR_CONNECT_FAIL 2014-03-09 01:49:14.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    Järjestelmä palautti viestin:%E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_DIR_LISTING squid-3.4.4.1/errors/fi/ERR_DIR_LISTING --- squid-3.4.4/errors/fi/ERR_DIR_LISTING 2014-03-09 01:49:15.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_DNS_FAIL squid-3.4.4.1/errors/fi/ERR_DNS_FAIL --- squid-3.4.4/errors/fi/ERR_DNS_FAIL 2014-03-09 01:49:15.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nimelle %H ei voitu määrittää IP-osoitetta.

    DNS-palvelin palautti viestin:

    %z

    Tämä tarkoittaa, että Välityspalvelin ei voinut selvittää URL:ssä esitettyä palvelinnimeä. Tarkista, että osoite on oikein.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ESI squid-3.4.4.1/errors/fi/ERR_ESI --- squid-3.4.4/errors/fi/ERR_ESI 2014-03-09 01:49:16.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/fi/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/fi/ERR_FORWARDING_DENIED 2014-03-09 01:49:16.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Edelleenohjaus evätty.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_DISABLED squid-3.4.4.1/errors/fi/ERR_FTP_DISABLED --- squid-3.4.4/errors/fi/ERR_FTP_DISABLED 2014-03-09 01:49:17.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP on poistettu käytöstä

    FTP on poistettu käytöstä.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_FAILURE squid-3.4.4.1/errors/fi/ERR_FTP_FAILURE --- squid-3.4.4/errors/fi/ERR_FTP_FAILURE 2014-03-09 01:49:17.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    Tapahtui FTP-protokollavirhe yritettäessä hakea URL-osoitetta: %U

    Squid lähetti seuraavan FTP-komennon:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/fi/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/fi/ERR_FTP_FORBIDDEN 2014-03-09 01:49:18.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid lähetti seuraavan FTP-komennon:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/fi/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/fi/ERR_FTP_NOT_FOUND 2014-03-09 01:49:18.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid lähetti seuraavan FTP-komennon:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/fi/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/fi/ERR_FTP_PUT_CREATED 2014-03-09 01:49:19.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Toiminto onnistui

    Tiedosto luotu


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/fi/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/fi/ERR_FTP_PUT_ERROR 2014-03-09 01:49:19.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: FTP upload failed

    ERROR

    FTP PUT upload failed

    Tapahtui FTP-protokollavirhe yritettäessä hakea URL-osoitetta: %U

    Squid lähetti seuraavan FTP-komennon:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/fi/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/fi/ERR_FTP_PUT_MODIFIED 2014-03-09 01:49:20.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Toiminto onnistui

    Tiedosto päivitetty


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/fi/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/fi/ERR_FTP_UNAVAILABLE 2014-03-09 01:49:21.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid lähetti seuraavan FTP-komennon:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/fi/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/fi/ERR_GATEWAY_FAILURE 2014-03-09 01:49:21.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ICAP_FAILURE squid-3.4.4.1/errors/fi/ERR_ICAP_FAILURE --- squid-3.4.4/errors/fi/ERR_ICAP_FAILURE 2014-03-09 01:49:22.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    Järjestelmä palautti viestin:%E

    This means that some aspect of the ICAP communication failed.

    Mahdollisia ongelmia:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_INVALID_REQ squid-3.4.4.1/errors/fi/ERR_INVALID_REQ --- squid-3.4.4/errors/fi/ERR_INVALID_REQ 2014-03-09 01:49:22.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Mahdollisia ongelmia:

    • Puuttuva tai tuntematon hakupyynnön tyyppi

    • Puuttuva URL

    • Puuttuva HTTP-tunniste (HTTP/1.0).

    • Hakupyyntö on liian suuri

    • Content-Length puuttuu POST- tai PUT-hakupyynnostä

    • Virheellinen merkki palvelinnimessä; alaviivat eivät ole sallittuja

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_INVALID_RESP squid-3.4.4.1/errors/fi/ERR_INVALID_RESP --- squid-3.4.4/errors/fi/ERR_INVALID_RESP 2014-03-09 01:49:23.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_INVALID_URL squid-3.4.4.1/errors/fi/ERR_INVALID_URL --- squid-3.4.4/errors/fi/ERR_INVALID_URL 2014-03-09 01:49:23.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Virheellinen URL-osoite

    Joku osa URL-osoitetta on virheellinen.

    Mahdollisia ongelmia:

    • Puuttuva tai virheellinen yhteyskäytäntö (tulisi olla http:// tai vastaava)

    • Puuttuva palvelinnimi

    • Kielletty kaksois-escape URL-osoitteessa

    • Virheellinen merkki palvelinnimessä; alaviivat eivät ole sallittuja

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_LIFETIME_EXP squid-3.4.4.1/errors/fi/ERR_LIFETIME_EXP --- squid-3.4.4/errors/fi/ERR_LIFETIME_EXP 2014-03-09 01:49:24.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Yhteyden elinaika umpeutui

    Squid on keskeyttänyt hakupuunnön, koska se ylitti suurimman mahdollisimman yhteyden elinajan.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_NO_RELAY squid-3.4.4.1/errors/fi/ERR_NO_RELAY --- squid-3.4.4/errors/fi/ERR_NO_RELAY 2014-03-09 01:49:24.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Ei WAIS-linkkiä

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/fi/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/fi/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:49:25.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/error-details.txt squid-3.4.4.1/errors/fi/error-details.txt --- squid-3.4.4/errors/fi/error-details.txt 2014-03-09 01:49:32.000000000 -0800 +++ squid-3.4.4.1/errors/fi/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/fi/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/fi/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/fi/ERR_PRECONDITION_FAILED 2014-03-09 01:49:25.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_READ_ERROR squid-3.4.4.1/errors/fi/ERR_READ_ERROR --- squid-3.4.4/errors/fi/ERR_READ_ERROR 2014-03-09 01:49:26.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lukuvirhe

    Järjestelmä palautti viestin:%E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_READ_TIMEOUT squid-3.4.4.1/errors/fi/ERR_READ_TIMEOUT --- squid-3.4.4/errors/fi/ERR_READ_TIMEOUT 2014-03-09 01:49:27.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lukemisen aikakatkaisu

    Järjestelmä palautti viestin:%E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/fi/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/fi/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:49:27.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/fi/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/fi/ERR_SHUTTING_DOWN 2014-03-09 01:49:28.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/fi/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/fi/ERR_SOCKET_FAILURE 2014-03-09 01:49:28.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Sokettivirhe

    Järjestelmä palautti viestin:%E

    Squid ei voinut luoda TCP-sokettia, oletettavasti valtavan kuorman vuoksi. Uusi hakupyyntösi.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_TOO_BIG squid-3.4.4.1/errors/fi/ERR_TOO_BIG --- squid-3.4.4/errors/fi/ERR_TOO_BIG 2014-03-09 01:49:29.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/fi/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/fi/ERR_UNSUP_HTTPVERSION 2014-03-09 01:49:30.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_UNSUP_REQ squid-3.4.4.1/errors/fi/ERR_UNSUP_REQ --- squid-3.4.4/errors/fi/ERR_UNSUP_REQ 2014-03-09 01:49:30.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Hakupyynnon tyyppi ja yhteyskäytäntö ei tuettu

    Squid ei tue kaikkia hakupyynnon tyyppejä kaikilla protokollilla. Et voi esimerkiksi käyttää POST-pyyntöä gopherilla.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_URN_RESOLVE squid-3.4.4.1/errors/fi/ERR_URN_RESOLVE --- squid-3.4.4/errors/fi/ERR_URN_RESOLVE 2014-03-09 01:49:31.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    The following error was encountered while trying to retrieve the URN: %U

    URN:ää ei voitu selvittää

    Hei, älä odota liikaa URN:iltä kun kyseessä on %T :-)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_WRITE_ERROR squid-3.4.4.1/errors/fi/ERR_WRITE_ERROR --- squid-3.4.4/errors/fi/ERR_WRITE_ERROR 2014-03-09 01:49:31.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Virhe kirjoitettaessa

    Järjestelmä palautti viestin:%E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fi/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/fi/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/fi/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:49:32.000000000 -0800 +++ squid-3.4.4.1/errors/fi/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - VIRHE: Pyydettyä URL-osoitetta ei voitu hakea

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nollan pituinen vastaus

    Haku ei tuonut Squidille mitään tietoa.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ACCESS_DENIED squid-3.4.4.1/errors/fr/ERR_ACCESS_DENIED --- squid-3.4.4/errors/fr/ERR_ACCESS_DENIED 2014-03-09 01:49:33.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Accès interdit.

    La configuration du contrôle d'accès, empêche votre requête d'être acceptée. Si vous pensez que c'est une erreur, contactez votre fournisseur d'accès.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:49:33.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Le temps de connexion de votre quota est dépassé.

    Ce proxy utilise un quota qui limite le temps de connexion. Le crédit de votre quota est actuellement vide, mais il sera de nouveau crédité lorsque vous allez redémarrer le proxy.

    Ces limites ont été fixées par le Fournisseur d'Accès Internet et agissent sur ce proxy. Si vous pensez que c'est une erreur, contactez le fournisseur d'accès.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/fr/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/fr/ERR_AGENT_CONFIGURE 2014-03-09 01:49:34.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuration du navigateur Web

    ERREUR

    Web Browser Configuration

    Vous devez corriger la configuration de votre navigateur Web, pour qu'il soit utilisé dans ce réseau

    Comment trouver ces réglages dans votre navigateur :

    Pour configurer Firefox, allez à :
    • Outils -> Options -> Avancé -> Réseau -> Paramètres de Connexion
    • Vous devez indiquer dans la fenêtre du proxy HTTP, le nom du proxy %h et le port %b
    Pour configurer Internet Explorer, allez à :
    • Outils -> Options Internet -> Connexion -> Paramètres LAN -> Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Pour configurer Opéra, allez à :
    • Outils -> Préférences -> Avancé -> Réseau -> Serveur Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_AGENT_WPAD squid-3.4.4.1/errors/fr/ERR_AGENT_WPAD --- squid-3.4.4/errors/fr/ERR_AGENT_WPAD 2014-03-09 01:49:34.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuration du navigateur Web

    ERREUR

    Web Browser Configuration

    Vous devez corriger la configuration de votre navigateur Web, pour qu'il soit utilisé dans ce réseau

    Comment trouver ces réglages dans votre navigateur :

    Pour configurer Firefox, allez à :
    • Outils -> Options -> Avancé -> Réseau -> Paramètres de Connexion
    • Sélectionnez détection automatique dans les paramètres du proxy pour ce réseau
    Pour configurer Internet Explorer, allez à :
    • Outils -> Options Internet -> Connexion -> Paramètres LAN -> Proxy
    • Sélectionnez le paramètre détection automatique
    Pour configurer Opéra, allez à :
    • Outils -> Préférences -> Avancé -> Réseau -> Serveur Proxy
    • Utilisez la sélection automatique pour configurer le proxy

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/fr/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/fr/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:49:35.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: Cache Access Denied

    ERROR

    Cache Accès interdit.

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Accès au cache interdit.

    Désolé, vous n'êtes pas autorisé à demander la requête %U de ce cache tant que vous ne serez pas identifié.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:49:35.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: Cache Manager Access Denied

    ERROR

    Cache Manager Accès interdit.

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Accès au Gestionnaire de Cache Interdit.

    Désolé, vous n'êtes pas autorisé à demander la requête %U au travers du gestionnaire de cache tant que vous ne serez pas identifié.

    S'il vous plait, contacter l'administrateur du proxy si vous avez des difficultés pour vous authentifier ou si vous êtes administrateur, lisez la documentation Squid sur l'interface du gestionnaire du cache, vérifiez aussi les fichiers logs du cache pour analyser en détails les messages d'erreurs.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/fr/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/fr/ERR_CANNOT_FORWARD 2014-03-09 01:49:36.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    En ce moment, il est impossible de retransmettre cette requête.

    This request could not be forwarded to the origin server or to any parent caches.

    Problèmes possibles :

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_CONFLICT_HOST squid-3.4.4.1/errors/fr/ERR_CONFLICT_HOST --- squid-3.4.4/errors/fr/ERR_CONFLICT_HOST 2014-03-09 01:49:37.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Problèmes possibles :

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_CONNECT_FAIL squid-3.4.4.1/errors/fr/ERR_CONNECT_FAIL --- squid-3.4.4/errors/fr/ERR_CONNECT_FAIL 2014-03-09 01:49:37.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    La connexion %I a échouée.

    Le système a retourné : %E

    L'hôte distant ou le réseau sont peut-être défaillant. Veuillez renouveler votre requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_DIR_LISTING squid-3.4.4.1/errors/fr/ERR_DIR_LISTING --- squid-3.4.4/errors/fr/ERR_DIR_LISTING 2014-03-09 01:49:38.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Répertoire : %U

    Répertoire : %U/

    Contenu du répertoire :

    %z
    %g
    Répertoire Parent (Répertoire Racine)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_DNS_FAIL squid-3.4.4.1/errors/fr/ERR_DNS_FAIL --- squid-3.4.4/errors/fr/ERR_DNS_FAIL 2014-03-09 01:49:38.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Impossible de déterminer l'adresse IP du nom d'hôte %H

    Le serveur DNS a retourné :

    %z

    Cela signifie que le proxy ne peut pas résoudre le nom d'hôte présent dans l'URL. Vérifier si l'adresse est correcte.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ESI squid-3.4.4.1/errors/fr/ERR_ESI --- squid-3.4.4/errors/fr/ERR_ESI 2014-03-09 01:49:39.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Le traitement ESI a échoué.

    Le processus ESI a répondu :

    %Z

    Cela signifie que le substitut n'a pas été capable de traiter le modèle ESI. Veuillez reporter cette erreur au webmaster.

    Votre webmaster est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/fr/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/fr/ERR_FORWARDING_DENIED 2014-03-09 01:49:40.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Transmission interdite.

    Ce proxy ne fera pas suivre votre requête, car il essaye de mettre en application une interaction. Le client %i est peut-être un cache mal configuré.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_DISABLED squid-3.4.4.1/errors/fr/ERR_FTP_DISABLED --- squid-3.4.4/errors/fr/ERR_FTP_DISABLED 2014-03-09 01:49:40.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    FTP est désactivé

    Ce proxy ne prend pas en compte le protocole FTP.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_FAILURE squid-3.4.4.1/errors/fr/ERR_FTP_FAILURE --- squid-3.4.4/errors/fr/ERR_FTP_FAILURE 2014-03-09 01:49:41.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    En essayant de charger l'URL : %U une erreur de protocole FTP est survenue.

    Squid a envoyé la commande FTP suivante :

    %f

    Le serveur a répondu :

    %F
    %g

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/fr/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/fr/ERR_FTP_FORBIDDEN 2014-03-09 01:49:41.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    En essayant de charger l'URL : %U une erreur d'authentification a eu lieu lors de l'accès au serveur FTP.

    Squid a envoyé la commande FTP suivante :

    %f

    Le serveur a répondu :

    %F
    %g

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/fr/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/fr/ERR_FTP_NOT_FOUND 2014-03-09 01:49:42.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'URL suivante n'a pas pu être chargée : %U

    Squid a envoyé la commande FTP suivante :

    %f

    Le serveur a répondu :

    %F
    %g

    Cela pourrait être causé par une URL FTP qui contient un chemin absolut (ce qui n'est pas compatible avec la RFC 1738). Si tel est le cas, le fichier peut être disponible à l'adresse %B.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/fr/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/fr/ERR_FTP_PUT_CREATED 2014-03-09 01:49:42.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP avec PUT, l'envoi du fichier a réussi.

    Opération réussie

    Le fichier a été créé


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/fr/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/fr/ERR_FTP_PUT_ERROR 2014-03-09 01:49:43.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: FTP upload failed

    ERROR

    FTP avec PUT, échec lors de l'envoi du fichier

    En essayant de charger l'URL : %U une erreur de protocole FTP est survenue.

    Squid a envoyé la commande FTP suivante :

    %f

    Le serveur a répondu :

    %F

    Cela signifie que le serveur FTP n'a pas les autorisations ou pas assez d'espace pour stocker ce fichier. Veuillez vérifier le chemin, les autorisations et l'espace disque puis essayez de nouveau.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/fr/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/fr/ERR_FTP_PUT_MODIFIED 2014-03-09 01:49:44.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP avec PUT, l'envoi du fichier a réussi.

    Opération réussie

    Le fichier a été mis à jour


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/fr/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/fr/ERR_FTP_UNAVAILABLE 2014-03-09 01:49:44.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    Le serveur FTP est surchargé et ne permet pas d'accéder à l'URL : %U

    Squid a envoyé la commande FTP suivante :

    %f

    Le serveur a répondu :

    %F
    %g

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/fr/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/fr/ERR_GATEWAY_FAILURE 2014-03-09 01:49:45.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Défaillance de la passerelle Proxy

    Une défaillance interne non-récupérable ou un problème de configuration empêchent cette requête de s'achever.

    Ces limites ont été fixées par le Fournisseur d'Accès Internet et agissent sur ce proxy. Si vous pensez que c'est une erreur, contactez le fournisseur d'accès.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ICAP_FAILURE squid-3.4.4.1/errors/fr/ERR_ICAP_FAILURE --- squid-3.4.4/errors/fr/ERR_ICAP_FAILURE 2014-03-09 01:49:45.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Erreur de protocole ICAP.

    Le système a retourné : %E

    Cela signifie que certains aspects de la communication ICAP a échoués.

    Problèmes possibles :

    • Le serveur ICAP n'est pas joignable.

    • Une réponse illégale a été reçue par le serveur ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_INVALID_REQ squid-3.4.4.1/errors/fr/ERR_INVALID_REQ --- squid-3.4.4/errors/fr/ERR_INVALID_REQ 2014-03-09 01:49:46.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    Requête invalide une erreur a été rencontrée en essayant de traiter la requête :

    %R

    Problèmes possibles :

    • Requête de la méthode non précisée ou inconnue.

    • L'URL n'est pas spécifiée

    • L'identifiant HTTP est absent pour (HTTP/1.0).

    • La requête est trop grande

    • Le champ "Content-Length" est absent, pour l'utilisation des requêtes avec POST ou PUT

    • Caractère illégal dans le nom d'hôte; Le caractère tiret bas n'est pas autorisé.

    • HTTP/1.1 Expect: cette fonction a besoin du logiciel HTTP/1.0.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_INVALID_RESP squid-3.4.4.1/errors/fr/ERR_INVALID_RESP --- squid-3.4.4/errors/fr/ERR_INVALID_RESP 2014-03-09 01:49:46.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    Réponse invalide une erreur a été rencontrée en essayant de traiter la requête :

    %R

    La réponse HTTP reçu, qui a été envoyée par le serveur n'a pas pu être compris ou a été mal formulé. Veuillez contacter le responsable du site.

    Si nécessaire, votre administrateur proxy peut vous fournir plus de détails sur la nature exacte du problème.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_INVALID_URL squid-3.4.4.1/errors/fr/ERR_INVALID_URL --- squid-3.4.4/errors/fr/ERR_INVALID_URL 2014-03-09 01:49:47.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    URL invalide

    Certains aspects de l'adresse URL est incorrect.

    Problèmes possibles :

    • Le protocole d'accès est absent ou incorrect (il doit être sous la forme http:// ou similaire)

    • Le nom d'hôte n'est pas spécifié

    • Les doubles espaces sont illégaux dans une adresse URL

    • Caractère illégal dans le nom d'hôte; Le caractère tiret bas n'est pas autorisé.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_LIFETIME_EXP squid-3.4.4.1/errors/fr/ERR_LIFETIME_EXP --- squid-3.4.4/errors/fr/ERR_LIFETIME_EXP 2014-03-09 01:49:48.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    La durée de vie de la connexion est dépassée

    Squid a mis fin à cette requête car elle a excédé la durée de vie maximale.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_NO_RELAY squid-3.4.4.1/errors/fr/ERR_NO_RELAY --- squid-3.4.4/errors/fr/ERR_NO_RELAY 2014-03-09 01:49:48.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Aucun relais WAIS

    Sur ce proxy il n'y a pas d'hôte définie pour le relais WAIS ! Adressez-vous à votre administrateur.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/fr/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/fr/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:49:49.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Aucun document valide n'a été trouvé dans le cache, de plus la directive only-if-cached a été spécifiée.

    Vous avez émis une demande avec une directive de contrôle du cache only-if-cached. Le document n'a pas été trouvé dans le cache ou il nécessite une opération de vérification, qui est interdite par la directive only-if-cached.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/error-details.txt squid-3.4.4.1/errors/fr/error-details.txt --- squid-3.4.4/errors/fr/error-details.txt 2014-03-09 01:49:56.000000000 -0800 +++ squid-3.4.4.1/errors/fr/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/fr/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/fr/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/fr/ERR_PRECONDITION_FAILED 2014-03-09 01:49:49.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    La précondition a échouée.

    Cela signifie :

    Au moins une précondition indiquée dans l'en-tête de la requête du client HTTP a échoué.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_READ_ERROR squid-3.4.4.1/errors/fr/ERR_READ_ERROR --- squid-3.4.4/errors/fr/ERR_READ_ERROR 2014-03-09 01:49:50.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Erreur de lecture

    Le système a retourné : %E

    Lors de la lecture des informations sur le réseau une erreur est survenue. Veuillez renouveler votre requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_READ_TIMEOUT squid-3.4.4.1/errors/fr/ERR_READ_TIMEOUT --- squid-3.4.4/errors/fr/ERR_READ_TIMEOUT 2014-03-09 01:49:50.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Délai de lecture dépassé

    Le système a retourné : %E

    Le délai a été dépassé lors de la lecture de données sur le réseau. Le réseau ou le serveur sont peut-être hors service ou surchargés. Merci de renouveler votre requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/fr/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/fr/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:49:51.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Il n'a pas été possible d'établir une connexion sécurisée avec %I

    The system returned:

    %E (TLS code: %x)

    %D

    Ce proxy et l'hôte distant n'ont pas pu négocier mutuellement une connexion sécurisée pour le traitement de votre requête. Il est possible que l'hôte distant ne supporte pas les connexions sécurisées, ou que le proxy n'est pas satisfait du certificat de sécurité de l'hôte distant.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/fr/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/fr/ERR_SHUTTING_DOWN 2014-03-09 01:49:52.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Le proxy est arrêté temporairement, actuellement il est impossible de satisfaire votre requête. Veuillez renouveler votre requête ultérieurement.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/fr/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/fr/ERR_SOCKET_FAILURE 2014-03-09 01:49:52.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Erreur de socket

    Le système a retourné : %E

    Squid n'est pas en mesure d'ouvrir le socket TCP, probablement due à une surcharge. Veuillez renouveler votre requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_TOO_BIG squid-3.4.4.1/errors/fr/ERR_TOO_BIG --- squid-3.4.4/errors/fr/ERR_TOO_BIG 2014-03-09 01:49:53.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    La requête ou la réponse est trop grande.

    Si vous effectuez une requête avec POST ou PUT, l'élément que vous essayez d'envoyer est alors trop volumineux.

    Si vous effectuez une requête avec GET, l'élément que vous essayez de télécharger est alors trop volumineux.

    Ces limites ont été fixées par le Fournisseur d'Accès Internet et agissent sur ce proxy. Si vous pensez que c'est une erreur, contactez le fournisseur d'accès.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/fr/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/fr/ERR_UNSUP_HTTPVERSION 2014-03-09 01:49:53.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    Version HTTP non supportée

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Unsupported HTTP version

    Ce Squid ne supporte pas la version HTTP que vous tentez d'utiliser.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_UNSUP_REQ squid-3.4.4.1/errors/fr/ERR_UNSUP_REQ --- squid-3.4.4/errors/fr/ERR_UNSUP_REQ 2014-03-09 01:49:54.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    La méthode de requête et le protocole ne sont pas pris en charge.

    Squid ne prend pas en charge tous les types de requêtes par rapport à tous les protocoles d'accès. Vous ne pouvez pas par exemple utiliser une requête POST avec le protocole Gopher.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_URN_RESOLVE squid-3.4.4.1/errors/fr/ERR_URN_RESOLVE --- squid-3.4.4/errors/fr/ERR_URN_RESOLVE 2014-03-09 01:49:54.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: The requested URN could not be retrieved

    ERROR

    L'URL n'a pas pu être chargée pour une demande URN

    L'erreur suivante s'est produite en essayant d'accéder à l'URN : %U

    Impossible de résoudre l'URN

    Hé! Il ne faut pas attendre grand-chose des URNs avec %T :)

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_WRITE_ERROR squid-3.4.4.1/errors/fr/ERR_WRITE_ERROR --- squid-3.4.4/errors/fr/ERR_WRITE_ERROR 2014-03-09 01:49:55.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Erreur d'écriture

    Le système a retourné : %E

    Lors de l'écriture des informations sur le réseau une erreur est survenue. Veuillez renouveler votre requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/fr/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/fr/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/fr/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:49:56.000000000 -0800 +++ squid-3.4.4.1/errors/fr/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR: L'URL demandée n'a pas pu être trouvé

    ERROR

    The requested URL could not be retrieved

    L'erreur suivante s'est produite en essayant d'accéder à l'URL : %U

    Réponse de taille zéro

    Squid n'a pas reçu toutes les données pour cette requête.

    Votre administrateur proxy est %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ACCESS_DENIED squid-3.4.4.1/errors/he/ERR_ACCESS_DENIED --- squid-3.4.4/errors/he/ERR_ACCESS_DENIED 2014-03-09 01:49:56.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    הגישה נדחתה

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:49:57.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    Time Quota Exceeded.

    בשרת הפרוקסי קיימת הגבלה למשך הזמן המותר לך להיות מחובר. כרגע המכסה שלך לזמן חיבור הסתימה, אבל המכסה תתמלא שוב כאשר יעבור פרק הזמן המוגדר.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/he/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/he/ERR_AGENT_CONFIGURE 2014-03-09 01:49:57.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - הגדרת דפדפן האינטרנט

    שגיאה

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    איך למצוא את ההגדרות האלה בדפדפן שלך:

    עבור דפדפן פיירפוקס, לך ל:
    • כלים -> אפשרויות -> אפשרויות מתקדמות -> רשת -> הגדרות חיבור
    • בתיבת הפרוקסי של HTTP, הקלד את שם שרת הפרוקסי %h ואת הפורט %b
    עבור דפדפן אינטרנט אקספלורר, לך ל:
    • כלים -> אפשרויות אינטרנט -> חיבורים -> הגדרות LAN -> פרוקסי
    • In the HTTP proxy box type the proxy name %h and port %b.
    עבור דפדפן אופרה, לך ל:
    • כלים -> העדפות -> הגדרות מתקדמות -> רשת -> שרתי פרוקסי
    • In the HTTP proxy box type the proxy name %h and port %b.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_AGENT_WPAD squid-3.4.4.1/errors/he/ERR_AGENT_WPAD --- squid-3.4.4/errors/he/ERR_AGENT_WPAD 2014-03-09 01:49:58.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - הגדרת דפדפן האינטרנט

    שגיאה

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    איך למצוא את ההגדרות האלה בדפדפן שלך:

    עבור דפדפן פיירפוקס, לך ל:
    • כלים -> אפשרויות -> אפשרויות מתקדמות -> רשת -> הגדרות חיבור
    • בחר "איתור הגדרות אוטומטי" עבר הרשת הזו
    עבור דפדפן אינטרנט אקספלורר, לך ל:
    • כלים -> אפשרויות אינטרנט -> חיבורים -> הגדרות LAN -> פרוקסי
    • בחר "איתור הגדרות אוטומטי"
    עבור דפדפן אופרה, לך ל:
    • כלים -> העדפות -> הגדרות מתקדמות -> רשת -> שרתי פרוקסי
    • בחר באיתור הגדרות אוטומטי עבור הגדרת הפרוקסי

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/he/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/he/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:49:58.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: Cache Access Denied

    ERROR

    Cache הגישה נדחתה

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    גישה ל-Cache נדחית

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/he/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/he/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:49:59.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: Cache Manager Access Denied

    ERROR

    Cache Manager הגישה נדחתה

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    גישת מנהל לשרת נדחית.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/he/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/he/ERR_CANNOT_FORWARD 2014-03-09 01:50:00.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    לא ניתן להעביר את הבקשה בשלב זה.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_CONFLICT_HOST squid-3.4.4.1/errors/he/ERR_CONFLICT_HOST --- squid-3.4.4/errors/he/ERR_CONFLICT_HOST 2014-03-09 01:50:00.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_CONNECT_FAIL squid-3.4.4.1/errors/he/ERR_CONNECT_FAIL --- squid-3.4.4/errors/he/ERR_CONNECT_FAIL 2014-03-09 01:50:01.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    החיבור ל %I נכשל.

    הודעת המערכת: %E

    The remote host or network may be down. Please try the request again.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_DIR_LISTING squid-3.4.4.1/errors/he/ERR_DIR_LISTING --- squid-3.4.4/errors/he/ERR_DIR_LISTING 2014-03-09 01:50:02.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - תיקייה: %U

    תיקייה: %U/

    תוכן התיקיה:

    %z
    %g
    תיקיית אב (תיקיית השורש)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_DNS_FAIL squid-3.4.4.1/errors/he/ERR_DNS_FAIL --- squid-3.4.4/errors/he/ERR_DNS_FAIL 2014-03-09 01:50:02.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    לא יכול למצוא כתובת IP בשביל %H

    הודעת שרת השמות:

    %z

    זה אומר ש השרת לא הצליח למצוא את השרת שצויין. בדוק את הכתובת.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ESI squid-3.4.4.1/errors/he/ERR_ESI --- squid-3.4.4/errors/he/ERR_ESI 2014-03-09 01:50:03.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    עיבוד ESI נכשל.

    The ESI processor returned:

    %Z

    משמעות הדבר היא שלא היה ניתן לעבד את תבנית ESI. אנא דווח על שגיאה זו למנהל הרשת.

    מנהל הרשת שלך הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/he/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/he/ERR_FORWARDING_DENIED 2014-03-09 01:50:04.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    העברה נדחית.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_DISABLED squid-3.4.4.1/errors/he/ERR_FTP_DISABLED --- squid-3.4.4/errors/he/ERR_FTP_DISABLED 2014-03-09 01:50:04.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    FTP מבוטל

    שרת זה אינו תומך ב-FTP.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_FAILURE squid-3.4.4.1/errors/he/ERR_FTP_FAILURE --- squid-3.4.4/errors/he/ERR_FTP_FAILURE 2014-03-09 01:50:05.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    קרתה שגיאת פרוטוקול FTP כאשר בוצע ניסיון לגשת אל הכתובת: %U

    שרת ה Squid שלח את פקודת ה-FTP הבאה:

    %f

    תגובת השרת היא:

    %F
    %g

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/he/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/he/ERR_FTP_FORBIDDEN 2014-03-09 01:50:06.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    שגיאה בזיהוי משתמש FTP כאשר בוצע ניסיון לגשת אל הכתובת: %U

    שרת ה Squid שלח את פקודת ה-FTP הבאה:

    %f

    תגובת השרת היא:

    %F
    %g

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/he/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/he/ERR_FTP_NOT_FOUND 2014-03-09 01:50:07.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    לא ניתן לגשת אל הכתובת: %U

    שרת ה Squid שלח את פקודת ה-FTP הבאה:

    %f

    תגובת השרת היא:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/he/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/he/ERR_FTP_PUT_CREATED 2014-03-09 01:50:08.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    הפעולה עברה בהצלחה

    הקובץ נוצר


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/he/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/he/ERR_FTP_PUT_ERROR 2014-03-09 01:50:08.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: FTP upload failed

    ERROR

    FTP PUT upload failed

    קרתה שגיאת פרוטוקול FTP כאשר בוצע ניסיון לגשת אל הכתובת: %U

    שרת ה Squid שלח את פקודת ה-FTP הבאה:

    %f

    תגובת השרת היא:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/he/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/he/ERR_FTP_PUT_MODIFIED 2014-03-09 01:50:09.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    הפעולה עברה בהצלחה

    הקובץ עודכן


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/he/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/he/ERR_FTP_UNAVAILABLE 2014-03-09 01:50:10.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    שרת ה-FTP היה עסוק מדי, כאשר ניסיתי לגשת אל הכתובת: %U

    שרת ה Squid שלח את פקודת ה-FTP הבאה:

    %f

    תגובת השרת היא:

    %F
    %g

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/he/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/he/ERR_GATEWAY_FAILURE 2014-03-09 01:50:10.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    Gateway Proxy Failure

    בעיה פנימית לא מוגדרת או הגדרות שגויות מונעים את השלמת הבקשה

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ICAP_FAILURE squid-3.4.4.1/errors/he/ERR_ICAP_FAILURE --- squid-3.4.4/errors/he/ERR_ICAP_FAILURE 2014-03-09 01:50:11.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    שגיאה בפרוטוקול ICAP.

    הודעת המערכת: %E

    משמעות הדבר היא כי היבט כלשהו של התקשורת ICAP נכשל.

    Some possible problems are:

    • שרת ה ICAP לא נגיש.

    • תגובה בלתי חוקית התקבלה משרת ה ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_INVALID_REQ squid-3.4.4.1/errors/he/ERR_INVALID_REQ --- squid-3.4.4/errors/he/ERR_INVALID_REQ 2014-03-09 01:50:12.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    בקשה לא חוקית אירעה שגיאה בעת ביצוע הבקשה:

    %R

    Some possible problems are:

    • סוג בקשה לא ידוע או חסר

    • כתובת URL חסרה.

    • Missing HTTP Identifier (HTTP/1.0).

    • הבקשה גדולה מידי.

    • חסר Content-Length בשביל בקשות POST או PUT

    • תווים לא חוקיים בשם השרת; קווים תחתונים אסורים

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_INVALID_RESP squid-3.4.4.1/errors/he/ERR_INVALID_RESP --- squid-3.4.4/errors/he/ERR_INVALID_RESP 2014-03-09 01:50:12.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    תגובה לא חוקית אירעה שגיאה בעת ביצוע הבקשה:

    %R

    התגובת ה HTTP שהתקבלה מהשרת אינה מובנת או פגומה. אנא צור קשר עם מפעיל האתר.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_INVALID_URL squid-3.4.4.1/errors/he/ERR_INVALID_URL --- squid-3.4.4/errors/he/ERR_INVALID_URL 2014-03-09 01:50:13.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    כתובת URL שגויה

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Missing or incorrect access protocol (should be http:// or similar)

    • חסר שם שרת

    • בריחה כפולה שגויה בנתיב

    • תווים לא חוקיים בשם השרת; קווים תחתונים אסורים

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_LIFETIME_EXP squid-3.4.4.1/errors/he/ERR_LIFETIME_EXP --- squid-3.4.4/errors/he/ERR_LIFETIME_EXP 2014-03-09 01:50:13.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    תוקף החיבור פג

    השרת ביטל את הבקשה בגלל שהיא עברה את אורך החיים המאושר ליצירת חיבור.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_NO_RELAY squid-3.4.4.1/errors/he/ERR_NO_RELAY --- squid-3.4.4/errors/he/ERR_NO_RELAY 2014-03-09 01:50:14.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    אין שרת WAIS

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/he/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/he/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:50:14.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/error-details.txt squid-3.4.4.1/errors/he/error-details.txt --- squid-3.4.4/errors/he/error-details.txt 2014-03-09 01:50:21.000000000 -0800 +++ squid-3.4.4.1/errors/he/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/he/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/he/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/he/ERR_PRECONDITION_FAILED 2014-03-09 01:50:15.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    ביצוע תנאי מקדים נכשל.

    מידע מפורט:

    לפחות תנאי מוקדם אחד שצויין על ידי לקוח ה HTTP לא מתקיים


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_READ_ERROR squid-3.4.4.1/errors/he/ERR_READ_ERROR --- squid-3.4.4/errors/he/ERR_READ_ERROR 2014-03-09 01:50:15.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    שגיאה בקריאה

    הודעת המערכת: %E

    An error condition occurred while reading data from the network. Please retry your request.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_READ_TIMEOUT squid-3.4.4.1/errors/he/ERR_READ_TIMEOUT --- squid-3.4.4/errors/he/ERR_READ_TIMEOUT 2014-03-09 01:50:16.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    הקריאה אורכת יותר מידי זמן

    הודעת המערכת: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/he/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/he/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:50:17.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    אירעה שגיאה בניסיון ליצור חיבור מאובטח ל %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/he/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/he/ERR_SHUTTING_DOWN 2014-03-09 01:50:17.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/he/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/he/ERR_SOCKET_FAILURE 2014-03-09 01:50:18.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    שגיאת חיבור

    הודעת המערכת: %E

    שרת ה Squid לא הצליח ליצור חיבור TCP, כנראה בגלל עומס יתר. אנא נסה שוב.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_TOO_BIG squid-3.4.4.1/errors/he/ERR_TOO_BIG --- squid-3.4.4/errors/he/ERR_TOO_BIG 2014-03-09 01:50:18.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    הבקשה או התשובה גדולים מדי.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/he/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/he/ERR_UNSUP_HTTPVERSION 2014-03-09 01:50:19.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    גרסת HTTP לא נתמכת

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    Unsupported HTTP version

    Squid לא מאפשר להשתמש בגרסת ה HTTP שאתה מנסה להשתמש.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_UNSUP_REQ squid-3.4.4.1/errors/he/ERR_UNSUP_REQ --- squid-3.4.4/errors/he/ERR_UNSUP_REQ 2014-03-09 01:50:19.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    שיטת בקשה ופרוטוקול לא נתמכים

    שרת ה Squid אינו תומך בכל שיטות הבקשה לכל הפרוטוקולים. לדוגמא אינך יכול לשלוח בקשת POST ב-Gopher.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_URN_RESOLVE squid-3.4.4.1/errors/he/ERR_URN_RESOLVE --- squid-3.4.4/errors/he/ERR_URN_RESOLVE 2014-03-09 01:50:20.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: The requested URN could not be retrieved

    ERROR

    לא ניתן לאחזר את כתובת ה URL מתוך כתובת ה URN

    השגיאה הבאה אירעה בזמן ניסיון לפענח את כתובת ה URN: %U

    Cannot Resolve URN

    אל תצפה ליותר מדי מ-URN על %T :)

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_WRITE_ERROR squid-3.4.4.1/errors/he/ERR_WRITE_ERROR --- squid-3.4.4/errors/he/ERR_WRITE_ERROR 2014-03-09 01:50:20.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    שגיאת כתיבה

    הודעת המערכת: %E

    An error condition occurred while writing to the network. Please retry your request.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/he/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/he/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/he/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:50:21.000000000 -0800 +++ squid-3.4.4.1/errors/he/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - שגיאה: לא ניתן לגשת אל הכתובת המבוקשת

    ERROR

    The requested URL could not be retrieved

    השגיאה הבאה אירעה בעת ניסיון לפענח את כתובת הURL: %U

    Zero Sized Reply

    השרת לא קיבל כל תשובה לבקשה זו.

    מנהל השרת הוא %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ACCESS_DENIED squid-3.4.4.1/errors/hu/ERR_ACCESS_DENIED --- squid-3.4.4/errors/hu/ERR_ACCESS_DENIED 2014-03-09 01:50:22.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Hozzáférés megtagadva

    Jelen pillanatban nincs jogosultsága a kért tartalom eléréséhez. A jogosultságok kiosztásával kapcsolatban a szerver üzemeltetőjét keresheti meg.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:50:22.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Az időkvóta elfogyott

    A proxyszerver kvóták használatával korlátozza a gépek hálózati idejét. A szerveren beállított időkeret elfogyott, és az csak a rendszergazda által megadott időintervallum kezdetekor lesz ismét felhasználható.

    Ezeket a korlátozásokat a proxyszervert üzemeltető internetszolgáltató szabályozza. Bővebb információért vegye fel a kapcsolatot a szolgáltatóval.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/hu/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/hu/ERR_AGENT_CONFIGURE 2014-03-09 01:50:23.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - A böngésző konfigurálása

    HIBA

    Web Browser Configuration

    A hálózat használatához módosítania kell a böngésző beállításait.

    Ezeket a beállításokat az alábbi menüpontokon keresztül találhatja meg:

    Ha Firefoxot használ:
    • Eszközök -> Beállítások -> Fejlett -> Hálózat -> Kapcsolatbeállítások
    • A HTTP proxy mezőben adja meg a proxy nevét (%h) és portszámát (%b).
    Ha Internet Explorert használ:
    • Eszközök -> Internetbeállítások -> Kapcsolat -> Helyi hálózat beállításai -> Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Ha Operát használ:
    • Eszközök -> Beállítások -> Fejlett -> Hálózat -> Proxyszerverek
    • In the HTTP proxy box type the proxy name %h and port %b.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_AGENT_WPAD squid-3.4.4.1/errors/hu/ERR_AGENT_WPAD --- squid-3.4.4/errors/hu/ERR_AGENT_WPAD 2014-03-09 01:50:23.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - A böngésző konfigurálása

    HIBA

    Web Browser Configuration

    A hálózat használatához módosítania kell a böngésző beállításait.

    Ezeket a beállításokat az alábbi menüpontokon keresztül találhatja meg:

    Ha Firefoxot használ:
    • Eszközök -> Beállítások -> Fejlett -> Hálózat -> Kapcsolatbeállítások
    • Válassza ki a „Proxybeállítások automatikus felismerése ehhez a hálózathoz” jelölőnégyzetet
    Ha Internet Explorert használ:
    • Eszközök -> Internetbeállítások -> Kapcsolat -> Helyi hálózat beállításai -> Proxy
    • Válassza ki az „Automatikus felismerés” opciót
    Ha Operát használ:
    • Eszközök -> Beállítások -> Fejlett -> Hálózat -> Proxyszerverek
    • Válassza ki az "Automatikus proxybeállítás használata" opciót

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/hu/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/hu/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:50:24.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Cache Access Denied

    ERROR

    Cache Hozzáférés megtagadva

    Hiba történt a(z) %U URL betöltése közben:

    A proxyszerver használatához bejelentkezés szükséges

    A(z) %U URL eléréséhez be kell jelentkeznie a proxyszerverre.

    Kérem, lépjen kapcsolatba a szerver üzemeltetőjével, ha nem tud bejelentkezni.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:50:24.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Cache Manager Access Denied

    ERROR

    Cache Manager Hozzáférés megtagadva

    Hiba történt a(z) %U URL betöltése közben:

    Adminisztrátori hozzáférés megtagadva

    A(z) %U URL gyorsítótár-kezelői eléréséhez be kell jelentkeznie a proxyszerverre.

    Kérem, lépjen kapcsolatba a szerver üzemeltetőjével, ha nem tud bejelentkezni. Ha Ön a szerver adminisztrátora, akkor olvassa el a Squid dokumentációját a gyorsítótár-kezelő interfész használatáról. A hiba pontos okáról a Squid logfájljából tájékozódhat.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/hu/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/hu/ERR_CANNOT_FORWARD 2014-03-09 01:50:25.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A kérés jelenleg nem továbbítható

    A kérés nem továbbítható a forrásszerver vagy valamelyik parent cache felé.

    A probléma lehetséges okai:

    • Az URL-ben szereplő szerver hálózati hiba miatt nem érhető el.
    • Egyetlen parent cache sem érhető el jelenleg.
    • A rendszergazda nem engedélyezte a proxyszerveren más szerverek közvetlen elérését.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_CONFLICT_HOST squid-3.4.4.1/errors/hu/ERR_CONFLICT_HOST --- squid-3.4.4/errors/hu/ERR_CONFLICT_HOST 2014-03-09 01:50:26.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Ütköző URI-hosztok

    Ez a hiba arra utal, hogy az elérni kívánt domainnév nem érhető el az Ön számítógépéről.

    A probléma lehetséges okai:

    • Előfordulhat, hogy a domain elköltözött. Kérem, küldje el a kérést újra.
    • Előfordulhat, hogy az elérni kívánt weboldal megköveteli a helyi, országspecifikus verzió használatát. Az internetszolgáltató DNS-szervereinek használata megoldja a problémát.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_CONNECT_FAIL squid-3.4.4.1/errors/hu/ERR_CONNECT_FAIL --- squid-3.4.4/errors/hu/ERR_CONNECT_FAIL 2014-03-09 01:50:26.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Nem sikerült kapcsolódni a(z) %I szerverhez

    A rendszer által visszaadott hibaüzenet: %E

    A hiba legvalószínűbb oka, hogy a távoli szerver vagy hálózat épp nem elérhető. Kérem, próbálja meg elérni a szervert később.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_DIR_LISTING squid-3.4.4.1/errors/hu/ERR_DIR_LISTING --- squid-3.4.4/errors/hu/ERR_DIR_LISTING 2014-03-09 01:50:27.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Könyvtár: %U

    Könyvtár: %U/

    A könyvtár tartalma:

    %z
    %g
    Szülőkönyvtár (Gyökérkönyvtár)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_DNS_FAIL squid-3.4.4.1/errors/hu/ERR_DNS_FAIL --- squid-3.4.4/errors/hu/ERR_DNS_FAIL 2014-03-09 01:50:27.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A(z) %H DNS-névhez tartozó IP-cím nem oldható fel

    A DNS-szerver válasza:

    %z

    A proxyszerver nem tudta feloldani az URL-ben szereplő hosztnevet. Kérem, ellenőrizze, hogy a cím helyes-e.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ESI squid-3.4.4.1/errors/hu/ERR_ESI --- squid-3.4.4/errors/hu/ERR_ESI 2014-03-09 01:50:28.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Az ESI feldolgozás nem sikerült

    Az ESI feldolgozó által visszaadott üzenet:

    %Z

    Ez a hiba arra utal, hogy a helyettesítő nem tudta feldolgozni az ESI-sablont. Kérem, jelezze a hibát a szerver üzemeltetőjének.

    A webszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/hu/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/hu/ERR_FORWARDING_DENIED 2014-03-09 01:50:28.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A kérés továbbítása tiltott

    A kérés nem továbbítható, mivel az egy testvéri kapcsolatot eredményezne. A kliens (%i) valószínűleg egy másik proxyszerver, ami hibásan van konfigurálva.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_DISABLED squid-3.4.4.1/errors/hu/ERR_FTP_DISABLED --- squid-3.4.4/errors/hu/ERR_FTP_DISABLED 2014-03-09 01:50:29.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Az FTP protokoll használata nem engedélyezett

    A proxyszerver nem támogatja az FTP-protokoll használatát.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_FAILURE squid-3.4.4.1/errors/hu/ERR_FTP_FAILURE --- squid-3.4.4/errors/hu/ERR_FTP_FAILURE 2014-03-09 01:50:29.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Protokollhiba történt a(z) %U URL betöltése közben.

    A proxyszerver által küldött FTP-parancs:

    %f

    A távoli szerver válasza:

    %F
    %g

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/hu/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/hu/ERR_FTP_FORBIDDEN 2014-03-09 01:50:30.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Authentikációs hiba történt a(z) %U URL betöltése közben.

    A proxyszerver által küldött FTP-parancs:

    %f

    A távoli szerver válasza:

    %F
    %g

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/hu/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/hu/ERR_FTP_NOT_FOUND 2014-03-09 01:50:31.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    A(z) %U URL nem tölthető be.

    A proxyszerver által küldött FTP-parancs:

    %f

    A távoli szerver válasza:

    %F
    %g

    A hibát abszolút elérési útvonal használata okozhatja, ami nem felel meg az RFC 1738 szabványnak. Ha valóban ez a hiba forrása, akkor próbálja meg elérni a fájlt itt: %B.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/hu/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/hu/ERR_FTP_PUT_CREATED 2014-03-09 01:50:31.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Sikeres PUT művelet

    Sikeres művelet

    A fájl létrehozása sikeresen megtörtént


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/hu/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/hu/ERR_FTP_PUT_ERROR 2014-03-09 01:50:32.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: FTP upload failed

    ERROR

    Sikertelen PUT művelet

    Protokollhiba történt a(z) %U URL betöltése közben.

    A proxyszerver által küldött FTP-parancs:

    %f

    A távoli szerver válasza:

    %F

    A hibát az okozhatja, hogy az FTP-szerveren elfogyott a szabad hely vagy jogosultság hiányában a fájl nem írható a háttértárolóra. Kérem, ellenőrizze a jogosultságokat és a szerveren rendelkezésre álló szabad tárkapacitás mennyiségét, majd ismételje meg a műveletet.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/hu/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/hu/ERR_FTP_PUT_MODIFIED 2014-03-09 01:50:32.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Sikeres PUT művelet

    Sikeres művelet

    A fájl frissítése sikeresen megtörtént


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/hu/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/hu/ERR_FTP_UNAVAILABLE 2014-03-09 01:50:33.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Az FTP-szerver túlterheltség miatt nem tudta kiszolgálni a(z) %U kérést.

    A proxyszerver által küldött FTP-parancs:

    %f

    A távoli szerver válasza:

    %F
    %g

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/hu/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/hu/ERR_GATEWAY_FAILURE 2014-03-09 01:50:33.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Átjáróhiba

    Egy belső hiba vagy konfigurációs probléma miatt a kérés nem dolgozható fel.

    Ezeket a korlátozásokat a proxyszervert üzemeltető internetszolgáltató szabályozza. Bővebb információért vegye fel a kapcsolatot a szolgáltatóval.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ICAP_FAILURE squid-3.4.4.1/errors/hu/ERR_ICAP_FAILURE --- squid-3.4.4/errors/hu/ERR_ICAP_FAILURE 2014-03-09 01:50:34.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    ICAP protokollhiba

    A rendszer által visszaadott hibaüzenet: %E

    Az ICAP kommunikáció során hiba lépett fel.

    A probléma lehetséges okai:

    • Az ICAP szerver nem elérhető

    • Az ICAP szerver érvénytelen választ küldött


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_INVALID_REQ squid-3.4.4.1/errors/hu/ERR_INVALID_REQ --- squid-3.4.4/errors/hu/ERR_INVALID_REQ 2014-03-09 01:50:34.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Érvénytelen kérés - hiba történt a kérés feldolgozása közben:

    %R

    A probléma lehetséges okai:

    • A kérés típusa nincs megadva vagy hibás formátumú

    • Hiányzó URL

    • Hiányzó HTTP-azonosító (HTTP/1.0)

    • A kérés mérete túllépte a szerveren beállított limitet

    • Hiányzó „Content-Length” fejléc a POST vagy PUT kérésben

    • Érvénytelen karakter a hosztnévben: a „_” karakter használata nem engedélyezett

    • A kérésben szereplő Expect: fejléc nem támogatott a HTTP/1.0 protokollban.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_INVALID_RESP squid-3.4.4.1/errors/hu/ERR_INVALID_RESP --- squid-3.4.4/errors/hu/ERR_INVALID_RESP 2014-03-09 01:50:35.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Érvénytelen válasz - hiba történt a kérés feldolgozása közben:

    %R

    A távoli szerver által küldött HTTP-válasz megsérült vagy értelmezhetetlen. Kérem, jelezze a hibát a szerver üzemeltetőjének.

    Forduljon a proxyszerver üzemeltetőjéhez, ha többet szeretne megtudni a problémáról.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_INVALID_URL squid-3.4.4.1/errors/hu/ERR_INVALID_URL --- squid-3.4.4/errors/hu/ERR_INVALID_URL 2014-03-09 01:50:36.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Érvénytelen URL

    Az URL hibás formátumú.

    A probléma lehetséges okai:

    • Az elérési protokoll (pl. http://) nincs megadva vagy hibás formátumú

    • Hiányzó hosztnév

    • Érvénytelen double-escape az URL-Path-ban

    • Érvénytelen karakter a hosztnévben: a „_” karakter használata nem engedélyezett

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_LIFETIME_EXP squid-3.4.4.1/errors/hu/ERR_LIFETIME_EXP --- squid-3.4.4/errors/hu/ERR_LIFETIME_EXP 2014-03-09 01:50:36.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A kapcsolat élettartama lejárt

    A kapcsolat élettartama lejárt, ezért a proxyszerver bontotta a kapcsolatot.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_NO_RELAY squid-3.4.4.1/errors/hu/ERR_NO_RELAY --- squid-3.4.4/errors/hu/ERR_NO_RELAY 2014-03-09 01:50:37.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Hiányzó WAIS továbbító

    A proxyszerveren nincs beállítva WAIS továbbító. Kérem, jelezze a problémát a rendszergazdának.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/hu/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/hu/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:50:37.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Az only-if-cached direktíva szerepel a kérésben, azonban a kért tartalom nem található meg a gyorsítótárban.

    A böngésző által küldött kérés tartalmazza az only-if-cached direktívát, de a kért tartalom nem szerepel a gyorsítótárban. A tartalom ismételt letöltésére lenne szükség, ezt azonban tiltja az only-if-cached direktíva.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/error-details.txt squid-3.4.4.1/errors/hu/error-details.txt --- squid-3.4.4/errors/hu/error-details.txt 2014-03-09 01:50:44.000000000 -0800 +++ squid-3.4.4.1/errors/hu/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/hu/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/hu/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/hu/ERR_PRECONDITION_FAILED 2014-03-09 01:50:38.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Egy előfeltétel nem teljesült

    A hiba lehetséges okai:

    A HTTP-kérésben szereplő előfeltételek nem teljesíthetők.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_READ_ERROR squid-3.4.4.1/errors/hu/ERR_READ_ERROR --- squid-3.4.4/errors/hu/ERR_READ_ERROR 2014-03-09 01:50:38.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Fogadási hiba

    A rendszer által visszaadott hibaüzenet: %E

    Hálózati hiba történt az adatok fogadása közben, kérem, ismételje meg a műveletet.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_READ_TIMEOUT squid-3.4.4.1/errors/hu/ERR_READ_TIMEOUT --- squid-3.4.4/errors/hu/ERR_READ_TIMEOUT 2014-03-09 01:50:39.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Időtúllépés történt az adatok fogadása közben

    A rendszer által visszaadott hibaüzenet: %E

    Időtúllépés történt az adatok fogadása közben. A távoli szerver vagy hálózat nem érhető el vagy túl van terhelve, kérem, próbálja újra később.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/hu/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/hu/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:50:40.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Nem sikerült a titkosított kapcsolat kiépítése a(z) %I szerverrel

    The system returned:

    %E (TLS code: %x)

    %D

    Nem sikerült kiépíteni a titkosított kapcsolatot a proxyszerver és a távoli kiszolgáló között. Lehet, hogy a távoli szerver nem támogatja a titkosított kapcsolatokat vagy olyan protokollt használ, ami a proxyszerveren nem engedélyezett.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/hu/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/hu/ERR_SHUTTING_DOWN 2014-03-09 01:50:40.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A proxyszerver leállítás alatt van, így jelen pillanatban nem tudja kiszolgálni a kérést. Kérem, próbálja újra később.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/hu/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/hu/ERR_SOCKET_FAILURE 2014-03-09 01:50:41.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A socket nem hozható létre

    A rendszer által visszaadott hibaüzenet: %E

    A proxyszerver nem tudott új TCP socketet nyitni, vélhetően a magas terhelés miatt. Kérem, ismételje meg a kérést később.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_TOO_BIG squid-3.4.4.1/errors/hu/ERR_TOO_BIG --- squid-3.4.4/errors/hu/ERR_TOO_BIG 2014-03-09 01:50:41.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    A kérés vagy a válasz mérete meghaladja a szerveren beállított limitet.

    POST vagy PUT kérés esetén valószínűleg túl nagy a feltölteni kívánt fájl mérete

    GET kérés esetén a letölteni próbált fájl mérete meghaladja a megengedett maximumot

    Ezeket a korlátozásokat a proxyszervert üzemeltető internetszolgáltató szabályozza. Bővebb információért vegye fel a kapcsolatot a szolgáltatóval.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/hu/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/hu/ERR_UNSUP_HTTPVERSION 2014-03-09 01:50:42.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    Nem támogatott HTTP-verzió

    Hiba történt a(z) %U URL betöltése közben:

    Unsupported HTTP version

    A proxyszerver nem támogatja a kérésben szereplő HTTP-verziót.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_UNSUP_REQ squid-3.4.4.1/errors/hu/ERR_UNSUP_REQ --- squid-3.4.4/errors/hu/ERR_UNSUP_REQ 2014-03-09 01:50:42.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Nem támogatott kéréstípus vagy protokoll

    A proxyszerver nem támogat minden létező kéréstípus és protokoll kombinációt, így pl. nem lehet POST kéréstípust használni egy Gopher kérésben.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_URN_RESOLVE squid-3.4.4.1/errors/hu/ERR_URN_RESOLVE --- squid-3.4.4/errors/hu/ERR_URN_RESOLVE 2014-03-09 01:50:43.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: The requested URN could not be retrieved

    ERROR

    Az URN-hez tartozó URL nem tölthető be

    Hiba történt a(z) %U URN betöltése közben:

    Az URN nem oldható fel

    Ne várjon túl sokat a %T-n lévő URN-ektől! :)

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_WRITE_ERROR squid-3.4.4.1/errors/hu/ERR_WRITE_ERROR --- squid-3.4.4/errors/hu/ERR_WRITE_ERROR 2014-03-09 01:50:44.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Küldési hiba

    A rendszer által visszaadott hibaüzenet: %E

    Hálózati hiba történt az adatok küldése közben, kérem, ismételje meg a műveletet.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hu/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/hu/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/hu/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:50:44.000000000 -0800 +++ squid-3.4.4.1/errors/hu/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HIBA: Az oldal nem tölthető be

    ERROR

    The requested URL could not be retrieved

    Hiba történt a(z) %U URL betöltése közben:

    Üres válasz

    A proxyszerver üres választ kapott a kérésre.

    A proxyszerver üzemeltetőjének e-mail címe: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ACCESS_DENIED squid-3.4.4.1/errors/hy/ERR_ACCESS_DENIED --- squid-3.4.4/errors/hy/ERR_ACCESS_DENIED 2014-03-09 01:50:45.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Մուտքն արգելված է.

    Մուտքի կառավարման պարամետրերը թույլ չեն տալիս իրականացնել Ձեր հարցումը տվյալ պահին.Եթե Դուք սա սխալ եք համարում,ապա դիմեք Ձեր ինտերնետ կապ ապահովողին․

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:50:45.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Ժամանակային սահմանափակումը գերազանցված է

    Պրոքսի սերվերը սահմանափակում է Ձեր համացանցում գտնվելու ժամանակը.Սահմանափակումը կգործի ցանցի կառավարիչի կողմից նշված ժամանակահատվածում

    Այս սահմանափակումը իրականացված է Ձեր ինտերնետ կապ ապահովողի կողմից: Եթե Դուք սա սխալ եք համարում, դիմեք նրան:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/hy/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/hy/ERR_AGENT_CONFIGURE 2014-03-09 01:50:46.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Վեբ բրաուզերի կարգաբերումներ

    ՍԽԱԼ

    Web Browser Configuration

    Այս ցանցից օգտվելու համար Ձեր բրաուզերը անհրաժեշտ է կարգաբերել

    Ինչպես փնտրել այս կարգաբերումները քո բրաուզերում:

    Firefox բրաուզերի համար այցելեք:
    • Գործիքներ -> Կարգաբերումներ -> Լրացուցիչ -> Ցանց -> Կապի կարգաբերումներ
    • HTTP proxy դաշտում նշիր proxy name %h և port 3128.
    Internet Explorer բրաուզերի համար այցելեք:
    • Գործիքներ -> Ինտերնետ կարգաբերումներ -> Կապ -> LAN կարգաբերումներ ->Պրոքսի
    • In the HTTP proxy box type the proxy name %h and port %b.
    Opera բրաուզերի համար այցելեք:
    • Գործիքներ -> Նախընտրություններ -> Լրացուցիչ -> Ցանց -> Պրոքսի սերվերներ
    • In the HTTP proxy box type the proxy name %h and port %b.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_AGENT_WPAD squid-3.4.4.1/errors/hy/ERR_AGENT_WPAD --- squid-3.4.4/errors/hy/ERR_AGENT_WPAD 2014-03-09 01:50:46.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Վեբ բրաուզերի կարգաբերումներ

    ՍԽԱԼ

    Web Browser Configuration

    Այս ցանցից օգտվելու համար Ձեր բրաուզերը անհրաժեշտ է կարգաբերել

    Ինչպես փնտրել այս կարգաբերումները քո բրաուզերում:

    Firefox բրաուզերի համար այցելեք:
    • Գործիքներ -> Կարգաբերումներ -> Լրացուցիչ -> Ցանց -> Կապի կարգաբերումներ
    • Ընտրեք Auto-detect proxy settings for this network
    Internet Explorer բրաուզերի համար այցելեք:
    • Գործիքներ -> Ինտերնետ կարգաբերումներ -> Կապ -> LAN կարգաբերումներ ->Պրոքսի
    • Ընտրեք Automatically detect settings
    Opera բրաուզերի համար այցելեք:
    • Գործիքներ -> Նախընտրություններ -> Լրացուցիչ -> Ցանց -> Պրոքսի սերվերներ
    • Ընտրեք Use Automatic proxy configuration

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/hy/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/hy/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:50:47.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Cache Access Denied

    ERROR

    Cache Մուտքն արգելված է.

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Մուտքը քեշին արգելված է.

    Ներողություն,Դուք չեք կարող իրականացնել հետևյալ հարցումը %U մինչև աութենտիֆիկացիան չանցնեք.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:50:47.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Cache Manager Access Denied

    ERROR

    Cache Manager Մուտքն արգելված է.

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Քեշի կառավառման մուտքն արգելված է.

    Ներողություն,Դուք չեք կարող քեշի կառավարման համակարգից իրականացնել հետևյալ հարցումը %U մինչև աութենտիֆիկացիան չանցնեք.

    Աութենտիֆիկացիայի հետ խնդիրներ առաջանալու դեպքում խնդրվում է դիմելքեշի կառավարիչին.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/hy/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/hy/ERR_CANNOT_FORWARD 2014-03-09 01:50:48.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Ձեր հարցումը հնարավոր չէ վերահասցեագրել տվյալ պահին

    Հարցումը չի կարող վերահասցեագրվել որևէ ծնողական քեշի

    Հնարավոր պատճառներն են:

    • Հնարավոր է, ելակետային սերվերներին միանալու համար անհրաժեշտ կապը խափանվել է
    • Բոլոր ծնողական քեշերը կարող են զբաղված լինել այս պահին
    • Կառավարիչը կարող է արգելել ուղիղ կապ հաստատել ելակետային սերվերների հետ

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_CONFLICT_HOST squid-3.4.4.1/errors/hy/ERR_CONFLICT_HOST --- squid-3.4.4/errors/hy/ERR_CONFLICT_HOST 2014-03-09 01:50:49.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    URI հանգույցի կոնֆլիկտ

    Սա նշանակում է, որ դոմեյնը ,որին փորձում եք կապվել, այլևս գոյություն չունի

    Հնարավոր պատճառներն են:

    • Հնարավոր է, դոմենը տեղափոխվել է․ Կրկին փորձեք
    • Օգտագործեք Ձեր պրովայդերի տրամադրած DNS սերվերները

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_CONNECT_FAIL squid-3.4.4.1/errors/hy/ERR_CONNECT_FAIL --- squid-3.4.4/errors/hy/ERR_CONNECT_FAIL 2014-03-09 01:50:49.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Չհաջողվեց կապ հաստատել %I -ի հետ

    Ստացված պատասխանը: %E

    Հեռակա հանգույցը կամ ցանցը չեն պատասխանում: Խնդրվում է կրկնել հարցումը:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_DIR_LISTING squid-3.4.4.1/errors/hy/ERR_DIR_LISTING --- squid-3.4.4/errors/hy/ERR_DIR_LISTING 2014-03-09 01:50:50.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Դիրեկտորիա: %U

    Դիրեկտորիա: %U/

    Դիրեկտորիայի պարունակությունը:

    %z
    %g
    Ծնողական դիրեկտորիա (Արմատական դիրեկտորիա)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_DNS_FAIL squid-3.4.4.1/errors/hy/ERR_DNS_FAIL --- squid-3.4.4/errors/hy/ERR_DNS_FAIL 2014-03-09 01:50:50.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Անհնար է որոշել %H հանգույցի IP հասցեն.

    DNS սերվերի պատասխանը:

    %z

    Սա նշանակում է, որ քեշը ի վիճակի չէ որոշել URL- ում նշված սերվերի հասցեն: Ստուգեք հասցեի ներմուծման ճշտությունը:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ESI squid-3.4.4.1/errors/hy/ERR_ESI --- squid-3.4.4/errors/hy/ERR_ESI 2014-03-09 01:50:51.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Չհաջողվեց մշակել ESI հարցումը

    ESI հարցման պատասխանն է։

    %Z

    Սա նշանակում է, որ փոխարինողը ի վիճակի չէ մշակել ESI կաղապարը:Խնդրվում է հայտնել այս մասին քեշի կառավարիչին:

    Ձեր կայքի կառավարիչը %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/hy/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/hy/ERR_FORWARDING_DENIED 2014-03-09 01:50:51.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Վերահասցեագրումն արգելված է.

    Այս քեշը անկարող է վերահասցեագրել Ձեր հարցումը sibling տիպի փոխհարաբերություններ հաստատելու պատճառով: Հավանական է, որ %i -ն սխալ սարքաբերված քեշ է.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_DISABLED squid-3.4.4.1/errors/hy/ERR_FTP_DISABLED --- squid-3.4.4/errors/hy/ERR_FTP_DISABLED 2014-03-09 01:50:52.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    FTP արձանագրությունն արգելված է

    Այս քեշը FTP արձանագրություն չի աջակցում

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_FAILURE squid-3.4.4.1/errors/hy/ERR_FTP_FAILURE --- squid-3.4.4/errors/hy/ERR_FTP_FAILURE 2014-03-09 01:50:53.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL -ի ստացման ընթացքում տեղի ունեցավ FTP արձանագրության սխալ: %U

    Squid-ը ուղարկեց հետևյալ FTP հրամանը:

    %f

    Սերվերը պատասխանեց:

    %F
    %g

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/hy/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/hy/ERR_FTP_FORBIDDEN 2014-03-09 01:50:53.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL -ի ստացման ընթացքում տեղի ունեցավ FTP աութենտիֆիկացիայի սխալ: %U

    Squid-ը ուղարկեց հետևյալ FTP հրամանը:

    %f

    Սերվերը պատասխանեց:

    %F
    %g

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/hy/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/hy/ERR_FTP_NOT_FOUND 2014-03-09 01:50:54.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    Հետևյալ URL-ն հնարավոր չէ ստանալ: %U

    Squid-ը ուղարկեց հետևյալ FTP հրամանը:

    %f

    Սերվերը պատասխանեց:

    %F
    %g

    Սա կարող է լինել FTP URL -ի բացարձակ ուղիով հարցման արդյունք (ինչը չի համապատասխանում RFC 1738-ին). Եթե սա է սխալի պատճառը, ապա ֆայլը կարող է գնտվել այստեղ %B.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/hy/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/hy/ERR_FTP_PUT_CREATED 2014-03-09 01:50:54.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Գործողությունը հաջողվեց: Ֆայլը ստեղծված է

    Գործողությունը հաջողվեց

    Ֆայլը ստեղծված է


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/hy/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/hy/ERR_FTP_PUT_ERROR 2014-03-09 01:50:55.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: FTP upload failed

    ERROR

    FTP upload գործողությունը խափանվեց

    URL -ի ստացման ընթացքում տեղի ունեցավ FTP արձանագրության սխալ: %U

    Squid-ը ուղարկեց հետևյալ FTP հրամանը:

    %f

    Սերվերը պատասխանեց:

    %F

    Սա նշանակում է,որ FTP սերվերը ֆայլը պահպանելու համար բավարար հիշողության ծավալ կամ թույտվություն չունի: Ստուգեք ճանապարհը, հիշողության ծավալը, մուտքի իրավունքները և կրկին փորձեք:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/hy/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/hy/ERR_FTP_PUT_MODIFIED 2014-03-09 01:50:56.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Գործողությունը հաջողվեց: Ֆայլը ստեղծված է

    Գործողությունը հաջողվեց

    Ֆայլը թարմացված է


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/hy/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/hy/ERR_FTP_UNAVAILABLE 2014-03-09 01:50:57.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում FTP սերվերը շատ զբաղված էր: %U

    Squid-ը ուղարկեց հետևյալ FTP հրամանը:

    %f

    Սերվերը պատասխանեց:

    %F
    %g

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/hy/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/hy/ERR_GATEWAY_FAILURE 2014-03-09 01:50:57.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Երթուղային պրոքսի սերվերի խափանում

    Ներքին խափանման պատճառով այս հարցումը հնարավոր չէ ավարտել

    Այս սահմանափակումը իրականացված է Ձեր ինտերնետ կապ ապահովողի կողմից: Եթե Դուք սա սխալ եք համարում, դիմեք նրան:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ICAP_FAILURE squid-3.4.4.1/errors/hy/ERR_ICAP_FAILURE --- squid-3.4.4/errors/hy/ERR_ICAP_FAILURE 2014-03-09 01:50:58.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    ICAP արձանարության սխալ

    Ստացված պատասխանը: %E

    Սա նշանակում է, որ ICAP կոմունիկացիայի որոշ ասպեկտներ սխալ են:

    Հնարավոր պատճառներն են:

    • ICAP սերվերը անհասանելի է:

    • Սխալ պատասխան է ստացվել ICAP սերվերից


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_INVALID_REQ squid-3.4.4.1/errors/hy/ERR_INVALID_REQ --- squid-3.4.4/errors/hy/ERR_INVALID_REQ 2014-03-09 01:50:59.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    Սխալ հարցում հարցումն իրականացնելու ընթացքում տեղի ունեցավ սխալ:

    %R

    Հնարավոր պատճառներն են:

    • Հարցման մեթոդը բացակայում է կամ անհայտ է

    • URL -ն բացակայում է

    • HTTP իդենտիֆիկատորը բացակայում է (HTTP/1.0)

    • Հարցման ծավալը շատ մեծ է

    • POST կամ PUT հարցումների համար Content-Length չի նշված

    • Անթույլատրելի նիշ սերվերի անվան մեջ; ընդգծման նիշն անթույլատրելի է

    • HTTP/1.1 Expect:հնարավորության համար հարցում է կատարվում HTTP/1.0 ծրագրային միջոցից

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_INVALID_RESP squid-3.4.4.1/errors/hy/ERR_INVALID_RESP --- squid-3.4.4/errors/hy/ERR_INVALID_RESP 2014-03-09 01:50:59.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    Անթույլատրելի պատասխան հարցումն իրականացնելու ընթացքում տեղի ունեցավ սխալ:

    %R

    Սերվերից ստացվող պատասխանն անհասկանալի է կամ այլայլված: Դիմեք տվյալ կայքի կառավարիչներին։ Ձեր քեշի կառավարիչը անհրաժեշտության դեպքում կարող է ավելի մանրակրկիտ նկարագրել խնդրի բնւյթը:

    Սերվերից ստացվող պատասխանն անհասկանալի է կամ այլայլված: Դիմեք տվյալ կայքի կառավարիչներին։ Ձեր քեշի կառավարիչը անհրաժեշտության դեպքում կարող է ավելի մանրակրկիտ նկարագրել խնդրի բնւյթը:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_INVALID_URL squid-3.4.4.1/errors/hy/ERR_INVALID_URL --- squid-3.4.4/errors/hy/ERR_INVALID_URL 2014-03-09 01:51:00.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Սխալ URL

    URL-ի որոշ ասպեկտներ սխալ են.

    Հնարավոր պատճառներն են:

    • Մուտքային արձանագրությունը սխալ է կամ բացակայում է (պետք է լինի http:// կամ նման)

    • Հանգույցի անունը բացակայում է

    • Անթույլատրելի կրկնակի կառավարող նիշ URL-ի ուղիում

    • Անթույլատրելի նիշ սերվերի անվան մեջ; ընդգծման նիշն անթույլատրելի է

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_LIFETIME_EXP squid-3.4.4.1/errors/hy/ERR_LIFETIME_EXP --- squid-3.4.4/errors/hy/ERR_LIFETIME_EXP 2014-03-09 01:51:01.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Կապի հաստատման ժամանակը սպառվեց

    Squid-ը ընդհատեց հարցումը կապ հաստատման առավելագույն ժամանակը գերազանցելու պատճառով

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_NO_RELAY squid-3.4.4.1/errors/hy/ERR_NO_RELAY --- squid-3.4.4/errors/hy/ERR_NO_RELAY 2014-03-09 01:51:02.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Wais Relay-ը որոշված չէ

    Այս քեշի համար WAIS Relay-ը որոշված չէ! Հայտնեք կառավարիչին:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/hy/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/hy/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:51:03.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Օբյեկտը քեշում գտնված չէ; ձևավորվեց only-if-cached դիրեկտիվը.

    Դուք իրականացրեցիք հարցում only-if-cached քեշի կառավարման դիրեկտիվով: Փաստաթուղթը քեշում բացակայում է կամ պահանջվում է only-if-cached դիրեկտիվի կողմից արգելված հաստատում:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/error-details.txt squid-3.4.4.1/errors/hy/error-details.txt --- squid-3.4.4/errors/hy/error-details.txt 2014-03-09 01:51:13.000000000 -0800 +++ squid-3.4.4.1/errors/hy/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/hy/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/hy/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/hy/ERR_PRECONDITION_FAILED 2014-03-09 01:51:04.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Չհաջողվեց մշակել նախապայմանը

    Սա նշանակում է:

    HTTP հարցումի նախապայմաններից առնվազն մեկը անհնար է մշակել


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_READ_ERROR squid-3.4.4.1/errors/hy/ERR_READ_ERROR --- squid-3.4.4/errors/hy/ERR_READ_ERROR 2014-03-09 01:51:05.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Ընթերցման սխալ

    Ստացված պատասխանը: %E

    Ցանցից տվյալների ընթերցման ընթացքում առաջացավ սխալ.Խնդրվում է կրկնել հարցումը.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_READ_TIMEOUT squid-3.4.4.1/errors/hy/ERR_READ_TIMEOUT --- squid-3.4.4/errors/hy/ERR_READ_TIMEOUT 2014-03-09 01:51:06.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Պատասխան սպասելու առավելագույն ժամանակը գերազանցված է

    Ստացված պատասխանը: %E

    Ցանցից տվյալների ընթերցման ընթացքում սպասման առավելագույն ժամանակը գերազանցվեց․Ցանցը կամ հանգույցը չեն աշխատում կամ գերբեռնված են։ Խնդրվում է կրկնել հարցումը

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/hy/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/hy/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:51:07.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Չհաջողվեց անվտանգ կապ հաստատել %I

    The system returned:

    %E (TLS code: %x)

    %D

    Հնարավոր է,որ հեռակա հանգույցը չի աջակցում անվտանգ կապի հաստատում

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/hy/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/hy/ERR_SHUTTING_DOWN 2014-03-09 01:51:08.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Այս քեշը տվյալ պահին գտնվում է անջատման պրոցեսում և չի կարող սպասարկել Ձեր հարցումը: Կրկնեք հարցումը որոշ ժամանակ անց:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/hy/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/hy/ERR_SOCKET_FAILURE 2014-03-09 01:51:09.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Socket -ի ձախողում

    Ստացված պատասխանը: %E

    Squid-ը չի կարող ստեղծել TCP Socket, հավանաբար գերբեռնվածության պատճառով: Խնդրվում է կրկնել հարցումը: Եթե իրավիճակը կրկնվի, դիմեք քեշի կառավարիչին․:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_TOO_BIG squid-3.4.4.1/errors/hy/ERR_TOO_BIG --- squid-3.4.4/errors/hy/ERR_TOO_BIG 2014-03-09 01:51:09.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Հարցումը կամ պատասխանը շատ մեծ ծավալ ունեն.

    POST հարցման օբյեկտը շատ մեծ ծավալ ունի.

    GET հարցման օբյեկտը շատ մեծ ծավալ ունի.

    Այս սահմանափակումը իրականացված է Ձեր ինտերնետ կապ ապահովողի կողմից: Եթե Դուք սա սխալ եք համարում, դիմեք նրան:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/hy/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/hy/ERR_UNSUP_HTTPVERSION 2014-03-09 01:51:10.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    HTTP արձանագրության այս վարկածը չի աջակցվում

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Unsupported HTTP version

    HTTP արձանագրության այն տեսակը, որը Դուք փորձում եք օգտագործել,այս Squid-ը չի ընդունում:

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_UNSUP_REQ squid-3.4.4.1/errors/hy/ERR_UNSUP_REQ --- squid-3.4.4/errors/hy/ERR_UNSUP_REQ 2014-03-09 01:51:11.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Հարցում իրականացնելու մեթոդը և արձանագրությունը չեն աջակցվում

    Squid-ը բոլոր արձանագրությունների համար բոլոր հարցման մեթոդները չի աջակցում. Օրինակ, Gopher արձանագրության համար չեք կարող POST հարցում կատարել.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_URN_RESOLVE squid-3.4.4.1/errors/hy/ERR_URN_RESOLVE --- squid-3.4.4/errors/hy/ERR_URN_RESOLVE 2014-03-09 01:51:11.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: The requested URN could not be retrieved

    ERROR

    Պահանջվող URN-ի համար URL-ն հնարավոր չէ ստանալ

    URN-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Չհաջողվեց մշակել URN հարցումը

    Չարժե շատ բան սպասել URN-ից %T -ի վրա :)

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_WRITE_ERROR squid-3.4.4.1/errors/hy/ERR_WRITE_ERROR --- squid-3.4.4/errors/hy/ERR_WRITE_ERROR 2014-03-09 01:51:12.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Գրանցման սխալ

    Ստացված պատասխանը: %E

    Տվյալները ցանցում գրանցելու ընթացքում առաջացավ սխալ․ Խնդրվում է կրկնել հարցումը․

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/hy/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/hy/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/hy/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:51:13.000000000 -0800 +++ squid-3.4.4.1/errors/hy/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ՍԽԱԼ: Պահանջվող URL-ն հնարավոր չէ ստանալ

    ERROR

    The requested URL could not be retrieved

    URL-ի ստացման ընթացքում առաջացավ հետևյալ սխալը: %U

    Զրոյական երկարությամբ պատասխան

    Քեշը ի պատասխան այս հարցումի ոչ մի տվյալ չի ստացել.

    Ձեր քեշի կառավարիչը %w է.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ACCESS_DENIED squid-3.4.4.1/errors/id/ERR_ACCESS_DENIED --- squid-3.4.4/errors/id/ERR_ACCESS_DENIED 2014-03-09 01:51:14.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Akses Ditolak

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:51:14.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/id/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/id/ERR_AGENT_CONFIGURE 2014-03-09 01:51:15.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_AGENT_WPAD squid-3.4.4.1/errors/id/ERR_AGENT_WPAD --- squid-3.4.4/errors/id/ERR_AGENT_WPAD 2014-03-09 01:51:16.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/id/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/id/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:51:17.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Access Denied

    ERROR

    Cache Akses Ditolak

    The following error was encountered while trying to retrieve the URL: %U

    Akses Cache Ditolak

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/id/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/id/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:51:17.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Manager Access Denied

    ERROR

    Cache Manager Akses Ditolak

    The following error was encountered while trying to retrieve the URL: %U

    Cache manager Akses ditolak.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/id/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/id/ERR_CANNOT_FORWARD 2014-03-09 01:51:18.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_CONFLICT_HOST squid-3.4.4.1/errors/id/ERR_CONFLICT_HOST --- squid-3.4.4/errors/id/ERR_CONFLICT_HOST 2014-03-09 01:51:19.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_CONNECT_FAIL squid-3.4.4.1/errors/id/ERR_CONNECT_FAIL --- squid-3.4.4/errors/id/ERR_CONNECT_FAIL 2014-03-09 01:51:19.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    The system returned: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_DIR_LISTING squid-3.4.4.1/errors/id/ERR_DIR_LISTING --- squid-3.4.4/errors/id/ERR_DIR_LISTING 2014-03-09 01:51:20.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_DNS_FAIL squid-3.4.4.1/errors/id/ERR_DNS_FAIL --- squid-3.4.4/errors/id/ERR_DNS_FAIL 2014-03-09 01:51:20.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ESI squid-3.4.4.1/errors/id/ERR_ESI --- squid-3.4.4/errors/id/ERR_ESI 2014-03-09 01:51:21.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/id/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/id/ERR_FORWARDING_DENIED 2014-03-09 01:51:22.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Forwarding Denied.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_DISABLED squid-3.4.4.1/errors/id/ERR_FTP_DISABLED --- squid-3.4.4/errors/id/ERR_FTP_DISABLED 2014-03-09 01:51:22.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP tidak aktif

    This cache does not support FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_FAILURE squid-3.4.4.1/errors/id/ERR_FTP_FAILURE --- squid-3.4.4/errors/id/ERR_FTP_FAILURE 2014-03-09 01:51:23.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    terjadi kesalahan Protokol FTP ketika mencoba untuk mengambil URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/id/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/id/ERR_FTP_FORBIDDEN 2014-03-09 01:51:23.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    terjadi kegagalan otentikasi FTP ketika mencoba untuk mengambil URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/id/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/id/ERR_FTP_NOT_FOUND 2014-03-09 01:51:24.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/id/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/id/ERR_FTP_PUT_CREATED 2014-03-09 01:51:24.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation successful

    File created


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/id/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/id/ERR_FTP_PUT_ERROR 2014-03-09 01:51:25.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: FTP upload failed

    ERROR

    FTP PUT upload failed

    terjadi kesalahan Protokol FTP ketika mencoba untuk mengambil URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/id/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/id/ERR_FTP_PUT_MODIFIED 2014-03-09 01:51:26.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation successful

    File sudah diperbaharui


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/id/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/id/ERR_FTP_UNAVAILABLE 2014-03-09 01:51:26.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/id/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/id/ERR_GATEWAY_FAILURE 2014-03-09 01:51:27.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ICAP_FAILURE squid-3.4.4.1/errors/id/ERR_ICAP_FAILURE --- squid-3.4.4/errors/id/ERR_ICAP_FAILURE 2014-03-09 01:51:27.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    The system returned: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • Sebuah tanggapan Illegal diterima dari ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_INVALID_REQ squid-3.4.4.1/errors/id/ERR_INVALID_REQ --- squid-3.4.4/errors/id/ERR_INVALID_REQ 2014-03-09 01:51:28.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Cacat Meminta kesalahan ditemukan sedangkan mencoba mengolah permintaan:

    %R

    Some possible problems are:

    • Missing or unknown request method.

    • Missing URL.

    • Missing HTTP Identifier (HTTP/1.0).

    • Request is too large.

    • Content-Length missing for POST or PUT requests.

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_INVALID_RESP squid-3.4.4.1/errors/id/ERR_INVALID_RESP --- squid-3.4.4/errors/id/ERR_INVALID_RESP 2014-03-09 01:51:28.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Cacat Jawaban kesalahan ditemukan sedangkan mencoba mengolah permintaan:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_INVALID_URL squid-3.4.4.1/errors/id/ERR_INVALID_URL --- squid-3.4.4/errors/id/ERR_INVALID_URL 2014-03-09 01:51:29.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Invalid URL

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Missing or incorrect access protocol (should be http:// or similar)

    • Missing hostname

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_LIFETIME_EXP squid-3.4.4.1/errors/id/ERR_LIFETIME_EXP --- squid-3.4.4/errors/id/ERR_LIFETIME_EXP 2014-03-09 01:51:30.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection Lifetime Expired

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_NO_RELAY squid-3.4.4.1/errors/id/ERR_NO_RELAY --- squid-3.4.4/errors/id/ERR_NO_RELAY 2014-03-09 01:51:30.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/id/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/id/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:51:31.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/error-details.txt squid-3.4.4.1/errors/id/error-details.txt --- squid-3.4.4/errors/id/error-details.txt 2014-03-09 01:51:37.000000000 -0800 +++ squid-3.4.4.1/errors/id/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/id/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/id/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/id/ERR_PRECONDITION_FAILED 2014-03-09 01:51:31.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_READ_ERROR squid-3.4.4.1/errors/id/ERR_READ_ERROR --- squid-3.4.4/errors/id/ERR_READ_ERROR 2014-03-09 01:51:32.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Error

    The system returned: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_READ_TIMEOUT squid-3.4.4.1/errors/id/ERR_READ_TIMEOUT --- squid-3.4.4/errors/id/ERR_READ_TIMEOUT 2014-03-09 01:51:32.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Timeout

    The system returned: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/id/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/id/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:51:33.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/id/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/id/ERR_SHUTTING_DOWN 2014-03-09 01:51:33.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/id/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/id/ERR_SOCKET_FAILURE 2014-03-09 01:51:34.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Socket Failure

    The system returned: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_TOO_BIG squid-3.4.4.1/errors/id/ERR_TOO_BIG --- squid-3.4.4/errors/id/ERR_TOO_BIG 2014-03-09 01:51:35.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/id/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/id/ERR_UNSUP_HTTPVERSION 2014-03-09 01:51:35.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_UNSUP_REQ squid-3.4.4.1/errors/id/ERR_UNSUP_REQ --- squid-3.4.4/errors/id/ERR_UNSUP_REQ 2014-03-09 01:51:36.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported Request Method and Protocol

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_URN_RESOLVE squid-3.4.4.1/errors/id/ERR_URN_RESOLVE --- squid-3.4.4/errors/id/ERR_URN_RESOLVE 2014-03-09 01:51:36.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

    ERROR

    URL untuk URN yang diminta tidak bisa didapatkan kembali

    The following error was encountered while trying to retrieve the URN: %U

    Tidak dapat menyelesaikan URN

    Hey, don't expect too much from URNs on %T :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_WRITE_ERROR squid-3.4.4.1/errors/id/ERR_WRITE_ERROR --- squid-3.4.4/errors/id/ERR_WRITE_ERROR 2014-03-09 01:51:37.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Write Error

    The system returned: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/id/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/id/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/id/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:51:37.000000000 -0800 +++ squid-3.4.4.1/errors/id/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid did not receive any data for this request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ACCESS_DENIED squid-3.4.4.1/errors/it/ERR_ACCESS_DENIED --- squid-3.4.4/errors/it/ERR_ACCESS_DENIED 2014-03-09 01:51:38.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Accesso negato.

    La richiesta non è permessa dalle impostazioni di sicurezza. Se ritieni sia un errore, contatta il fornitore del servizio.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:51:38.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Questi limiti sono stati stabiliti dall'ISP che gestisce questo proxy. Se ritieni sia un errore, contatta il fornitore del servizio.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/it/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/it/ERR_AGENT_CONFIGURE 2014-03-09 01:51:39.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configurazione del browser

    ERRORE

    Web Browser Configuration

    La configurazione del tuo browser dev'essere modificata prima di poter utilizzare questa rete.

    Indicazioni su come configurare il tuo browser sono disponibili a:

    Per configurare Mozilla Firefox accedere a:
    • Strumenti -> Opzioni -> Avanzate -> Rete -> Impostazioni di connessione
    • In the HTTP proxy box type the proxy name %h and port %b.
    Per configurare Microsoft Internet Explorer:
    • Strumenti -> Opzioni Internet -> Connessioni -> Impostazioni LAN ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Per configurare i browser Opera:
    • Strumenti -> Preferenze -> Avanzate -> Rete -> Server proxy
    • In the HTTP proxy box type the proxy name %h and port %b.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_AGENT_WPAD squid-3.4.4.1/errors/it/ERR_AGENT_WPAD --- squid-3.4.4/errors/it/ERR_AGENT_WPAD 2014-03-09 01:51:40.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configurazione del browser

    ERRORE

    Web Browser Configuration

    La configurazione del tuo browser dev'essere modificata prima di poter utilizzare questa rete.

    Indicazioni su come configurare il tuo browser sono disponibili a:

    Per configurare Mozilla Firefox accedere a:
    • Strumenti -> Opzioni -> Avanzate -> Rete -> Impostazioni di connessione
    • Select Auto-detect proxy settings for this network
    Per configurare Microsoft Internet Explorer:
    • Strumenti -> Opzioni Internet -> Connessioni -> Impostazioni LAN ->Proxy
    • Seleziona "Rileva automaticamente impostazioni"
    Per configurare i browser Opera:
    • Strumenti -> Preferenze -> Avanzate -> Rete -> Server proxy
    • Seleziona "Usa script di configurazione automatica"

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/it/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/it/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:51:41.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Cache Access Denied

    ERROR

    Cache Accesso negato.

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Accesso alla cache negato.

    Per richiedere %U da questa cache è necessario prima identificarsi.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/it/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/it/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:51:42.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Cache Manager Access Denied

    ERROR

    Cache Manager Accesso negato.

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    L'accesso al cache manager è negato.

    Per richiedere %U da questo cache manager è necessario prima identificarsi.

    Si prega di contattare il gestore del vostro proxy se avete diffcoltà nell'identificarvi per l'accesso al servizio o, se siete l'amministratore, di consultare la documentazione di Squid riguardante l'interfaccia del cache manager e di verificare il log del servizio alla ricerca informazioni più dettagliate sull'errore.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/it/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/it/ERR_CANNOT_FORWARD 2014-03-09 01:51:42.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Non è possibile inoltrare la richiesta in questo momento.

    This request could not be forwarded to the origin server or to any parent caches.

    Alcuni dei possibili problemi sono:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_CONFLICT_HOST squid-3.4.4.1/errors/it/ERR_CONFLICT_HOST --- squid-3.4.4/errors/it/ERR_CONFLICT_HOST 2014-03-09 01:51:43.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Alcuni dei possibili problemi sono:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_CONNECT_FAIL squid-3.4.4.1/errors/it/ERR_CONNECT_FAIL --- squid-3.4.4/errors/it/ERR_CONNECT_FAIL 2014-03-09 01:51:44.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    La connessione a %I non è riuscita.

    Il sistema ha risposto: %E

    Il server remoto e` irraggiungibile, forse per un guasto di rete. Riprova tra qualche minuto.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_DIR_LISTING squid-3.4.4.1/errors/it/ERR_DIR_LISTING --- squid-3.4.4/errors/it/ERR_DIR_LISTING 2014-03-09 01:51:44.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Contenuto della directory:

    %z
    %g
    Directory superiore (Directory principale)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_DNS_FAIL squid-3.4.4.1/errors/it/ERR_DNS_FAIL --- squid-3.4.4/errors/it/ERR_DNS_FAIL 2014-03-09 01:51:45.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Non è stato possibile risalire all'indirizzo IP corrispondente al nome host %H

    Il server DNS ha risposto:

    %z

    Questo significa che il Proxy non è riuscito a tradurre il nome host nella URL nel relativo indirizzo. Verificate la correttezza dell'indirizzo e riprovate.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ESI squid-3.4.4.1/errors/it/ERR_ESI --- squid-3.4.4/errors/it/ERR_ESI 2014-03-09 01:51:46.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    L'elaborazione ESI è fallita.

    Il sistema di gestione delle funzioni ESI ha risposto:

    %Z

    Questo significa che il surrogate non è stato in grado di processare il template ESI. Si prega di segnalare l'errore al webmaster.

    Il webmaster è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/it/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/it/ERR_FORWARDING_DENIED 2014-03-09 01:51:46.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Inoltro negato.

    Questo proxy non inoltrerà questa richiesta perché tenta di forzare una relazione di parentela. Forse il client all'indirizzo %i è un proxy configurato in modo errato.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_DISABLED squid-3.4.4.1/errors/it/ERR_FTP_DISABLED --- squid-3.4.4/errors/it/ERR_FTP_DISABLED 2014-03-09 01:51:47.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Il protocollo FTP è disabilitato.

    Questo proxy non supporta il protocollo FTP.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_FAILURE squid-3.4.4.1/errors/it/ERR_FTP_FAILURE --- squid-3.4.4/errors/it/ERR_FTP_FAILURE 2014-03-09 01:51:48.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Si è verificato un errore di protocollo FTP durante l'accesso alla URL %U.

    Il comando FTP inviato da Squid era:

    %f

    Il server ha risposto:

    %F
    %g

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/it/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/it/ERR_FTP_FORBIDDEN 2014-03-09 01:51:48.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Le credenziali fornite per l'accesso al server FTP relativo alla URL %U sono invalide.

    Il comando FTP inviato da Squid era:

    %f

    Il server ha risposto:

    %F
    %g

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/it/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/it/ERR_FTP_NOT_FOUND 2014-03-09 01:51:49.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Non è stato possibile accedere alla URL: %U.

    Il comando FTP inviato da Squid era:

    %f

    Il server ha risposto:

    %F
    %g

    Questo potrebbe essere causato da una URL FTP contenente percorsi assoluti (il che non è compatibile con la RFC 1738). Se è questa la causa, il file può essere disponibile all'indirizzo %B.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/it/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/it/ERR_FTP_PUT_CREATED 2014-03-09 01:51:49.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operazione eseguita correttamente

    Il file è stato creato.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/it/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/it/ERR_FTP_PUT_ERROR 2014-03-09 01:51:50.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: FTP upload failed

    ERROR

    FTP PUT upload failed

    Si è verificato un errore di protocollo FTP durante l'accesso alla URL %U.

    Il comando FTP inviato da Squid era:

    %f

    Il server ha risposto:

    %F

    Questo significa che il server FTP potrebbe non avere i permessi o lo spazio per ricevere il file. Si prega di controllare il percorso, i permessi e lo spazio su disco e riprovare.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/it/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/it/ERR_FTP_PUT_MODIFIED 2014-03-09 01:51:50.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operazione eseguita correttamente

    Il file è stato aggiornato.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/it/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/it/ERR_FTP_UNAVAILABLE 2014-03-09 01:51:51.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Il server FTP era sovraccarico e non ha consentito di accedere alla URL: %U.

    Il comando FTP inviato da Squid era:

    %f

    Il server ha risposto:

    %F
    %g

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/it/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/it/ERR_GATEWAY_FAILURE 2014-03-09 01:51:51.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ICAP_FAILURE squid-3.4.4.1/errors/it/ERR_ICAP_FAILURE --- squid-3.4.4/errors/it/ERR_ICAP_FAILURE 2014-03-09 01:51:52.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Si è verificato un errore di protocollo ICAP.

    Il sistema ha risposto: %E

    Questo significa che qualche aspetto della comunicazione ICAP non è stato completato regolarmente.

    Alcuni dei possibili problemi sono:

    • Il server ICAP non è raggiungibile.

    • Il server ICAP ha dato una risposta non valida (illegal response).


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_INVALID_REQ squid-3.4.4.1/errors/it/ERR_INVALID_REQ --- squid-3.4.4/errors/it/ERR_INVALID_REQ 2014-03-09 01:51:53.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Richiesta non valida. Si è verificato un errore durante l'elaborazione della richiesta:

    %R

    Alcuni dei possibili problemi sono:

    • Metodo della richiesta non specificato o sconoscito.

    • URL non specificata.

    • L'identificativo del protocollo HTTP è mancante (HTTP/1.0).

    • La richiesta è di dimensioni troppo grandi.

    • La richiesta di tipo POST o PUT non contiene il campo Content-Length.

    • Nome host non valido: i caratteri underscore ("_") non sono consentiti.

    • Un software HTTP/1.0 sta cercando di utilizzare le funzionalità Expect di HTTP/1.1.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_INVALID_RESP squid-3.4.4.1/errors/it/ERR_INVALID_RESP --- squid-3.4.4/errors/it/ERR_INVALID_RESP 2014-03-09 01:51:53.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Risposta non valida. Si è verificato un errore durante l'elaborazione della richiesta:

    %R

    Il messaggio di risposta HTTP ricevuto dal server non era comprensibile o era irregolare. Si prega di contattare il gestore del sito per segnalargli l'errore.

    L'amministratore del proxy potrebbe essere in grado di fornire ulteriori dettagli sul tipo di problema.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_INVALID_URL squid-3.4.4.1/errors/it/ERR_INVALID_URL --- squid-3.4.4/errors/it/ERR_INVALID_URL 2014-03-09 01:51:54.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    URL non valida

    Qualcosa nella URL richiesta non è corretto.

    Alcuni dei possibili problemi sono:

    • Protocollo di accesso mancante o non corretto (dovrebbe essere http:// o simile).

    • Nome host non specificato.

    • Doppia codifica ("double-escape") non valida nella path della URL.

    • Nome host non valido: i caratteri underscore ("_") non sono consentiti.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_LIFETIME_EXP squid-3.4.4.1/errors/it/ERR_LIFETIME_EXP --- squid-3.4.4/errors/it/ERR_LIFETIME_EXP 2014-03-09 01:51:54.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Il tempo di mantenimento di connessioni inattive è scaduto.

    La richiesta è stata interrotta perché è stato superato il limite di durata massima della connessione.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_NO_RELAY squid-3.4.4.1/errors/it/ERR_NO_RELAY --- squid-3.4.4/errors/it/ERR_NO_RELAY 2014-03-09 01:51:55.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Le funzioni di inoltro Wais non sono implementate.

    Non è stato definito nessun host per il relay del servizio WAIS! Prenditela con l'amministratore.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/it/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/it/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:51:55.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Non è stato possibile reperire un documento valido nella cache, e la richiesta contiene la direttiva only-if-cached.

    La richiesta contiene la direttiva di controllo della cache only-if-cached. Non è stato possibile trovare il relativo documento nella cache, oppure richiedeva una operazione di verifica, non consentita dalla direttiva.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/error-details.txt squid-3.4.4.1/errors/it/error-details.txt --- squid-3.4.4/errors/it/error-details.txt 2014-03-09 01:52:02.000000000 -0800 +++ squid-3.4.4.1/errors/it/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/it/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/it/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/it/ERR_PRECONDITION_FAILED 2014-03-09 01:51:56.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_READ_ERROR squid-3.4.4.1/errors/it/ERR_READ_ERROR --- squid-3.4.4/errors/it/ERR_READ_ERROR 2014-03-09 01:51:56.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Errore di lettura

    Il sistema ha risposto: %E

    Si è verificato un errore durante la lettura delle informazioni dalla rete. Riprova più tardi.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_READ_TIMEOUT squid-3.4.4.1/errors/it/ERR_READ_TIMEOUT --- squid-3.4.4/errors/it/ERR_READ_TIMEOUT 2014-03-09 01:51:57.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Timeout nella lettura

    Il sistema ha risposto: %E

    Si è verificato un errore di time-out durante la lettura delle informazioni. La rete o il server potrebbero essere inaccessibili o sovraccarichi. Riprovare più tardi.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/it/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/it/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:51:57.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Non è stato possibile stabilire una connessione sicura verso %I

    The system returned:

    %E (TLS code: %x)

    %D

    Questo proxy e l'host remoto non sono riusciti a negoziare una connessione sicura. Probabilmente il server remoto non supporta connessioni sicure, o il proxy non è soddisfatto delle credenziali di sicurezza proposte dall'host.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/it/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/it/ERR_SHUTTING_DOWN 2014-03-09 01:51:58.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Non è possibile eseguire la richiesta perché è in corso lo spegnimento del proxy. Riprova tra poco.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/it/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/it/ERR_SOCKET_FAILURE 2014-03-09 01:51:58.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    L'operazione di rete (socket) è fallita.

    Il sistema ha risposto: %E

    Squid non è in grado di aprire un socket TCP, probabilmente per un sovraccarico. Riprovare più tardi.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_TOO_BIG squid-3.4.4.1/errors/it/ERR_TOO_BIG --- squid-3.4.4/errors/it/ERR_TOO_BIG 2014-03-09 01:51:59.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    La richesta o la risposta è di dimensioni troppo grandi.

    Se la richiesta è di tipo PUT, ciò che si sta cercando di inviare è di dimensioni troppo grandi.

    Se la richiesta è di tipo GET, ciò che si sta cercando di scaricare è di dimensioni troppo grandi.

    Questi limiti sono stati stabiliti dall'ISP che gestisce questo proxy. Se ritieni sia un errore, contatta il fornitore del servizio.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/it/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/it/ERR_UNSUP_HTTPVERSION 2014-03-09 01:52:00.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    Versione HTTP non supportata

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Unsupported HTTP version

    Questa installazione di Squid non supporta la versione HTTP che si sta cercando di utilizzare.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_UNSUP_REQ squid-3.4.4.1/errors/it/ERR_UNSUP_REQ --- squid-3.4.4/errors/it/ERR_UNSUP_REQ 2014-03-09 01:52:00.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Metodo e protocollo della richiesta non sono supportati.

    Squid non consente di utilizzare qualsiasi tipo di richiesta per qualsiasi protocollo (a esempio non consente una richiesta POST su protocollo Gopher).

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_URN_RESOLVE squid-3.4.4.1/errors/it/ERR_URN_RESOLVE --- squid-3.4.4/errors/it/ERR_URN_RESOLVE 2014-03-09 01:52:01.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: The requested URN could not be retrieved

    ERROR

    Non è stato possibile ottenere una URL corrispondente alla URN richiesta.

    Mentre si cercava di accedere alla URN %U si è presentato il seguente errore:

    Impossibile risolvere la URN.

    Ehi, non ci si deve aspettare granché dalle URN su %T :)

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_WRITE_ERROR squid-3.4.4.1/errors/it/ERR_WRITE_ERROR --- squid-3.4.4/errors/it/ERR_WRITE_ERROR 2014-03-09 01:52:01.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Errore durante l'operazione di scrittura

    Il sistema ha risposto: %E

    Si è verificato un errore durante la scrittura di informazioni sulla rete. Riprova più tardi.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/it/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/it/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/it/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:52:02.000000000 -0800 +++ squid-3.4.4.1/errors/it/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRORE: Non è stato possibile accedere alla URL richiesta.

    ERROR

    The requested URL could not be retrieved

    Mentre si cercava di accedere alla URL %U si è presentato il seguente errore:

    Risposta di dimensione nulla

    Squid non ha ricevuto dati per questa richiesta.

    L'amministratore del proxy è %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ja/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ja/ERR_ACCESS_DENIED 2014-03-09 01:52:02.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    アクセスを拒否されました。

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:52:03.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ja/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ja/ERR_AGENT_CONFIGURE 2014-03-09 01:52:03.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    エラー

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_AGENT_WPAD squid-3.4.4.1/errors/ja/ERR_AGENT_WPAD --- squid-3.4.4/errors/ja/ERR_AGENT_WPAD 2014-03-09 01:52:04.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    エラー

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ja/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ja/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:52:05.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: Cache Access Denied

    ERROR

    Cache アクセスを拒否されました。

    The following error was encountered while trying to retrieve the URL: %U

    キャッシュへのアクセスを拒否されました．

    申し訳ありませんが、あなた自身の認証を済ませるまで、このキャッシュに %U をリクエストすることは現在許可されていません。

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:52:05.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: Cache Manager Access Denied

    ERROR

    Cache Manager アクセスを拒否されました。

    The following error was encountered while trying to retrieve the URL: %U

    キャッシュマネジャへのアクセスを拒否されました．

    申し訳ありませんが、あなた自身の認証を済ませるまで、このキャッシュマネージャに %U をリクエストすることは現在許可されていません。

    あなた自身の認証が困難な場合は、キャッシュの管理者に連絡してください。または、あなた自身が管理者なら、キャッシュマネージャ・インターフェイスのSquidの文書を読んで、キャッシュのログにある詳細なエラーメッセージを確認してください。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ja/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ja/ERR_CANNOT_FORWARD 2014-03-09 01:52:06.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    現在，リクエストの転送はできません．

    This request could not be forwarded to the origin server or to any parent caches.

    ありそうな問題:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ja/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ja/ERR_CONFLICT_HOST 2014-03-09 01:52:06.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    ありそうな問題:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ja/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ja/ERR_CONNECT_FAIL 2014-03-09 01:52:07.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    %I への接続に失敗しました。

    システムが以下のエラーを返しました: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_DIR_LISTING squid-3.4.4.1/errors/ja/ERR_DIR_LISTING --- squid-3.4.4/errors/ja/ERR_DIR_LISTING 2014-03-09 01:52:07.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ディレクトリ: %U

    Directory: %U/

    ディレクトリの内容:

    %z
    %g
    親のディレクトリ (ルート・ディレクトリ)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_DNS_FAIL squid-3.4.4.1/errors/ja/ERR_DNS_FAIL --- squid-3.4.4/errors/ja/ERR_DNS_FAIL 2014-03-09 01:52:08.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    以下のホスト名の IP address を調べられません．%H

    DNSサーバの応答:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ESI squid-3.4.4.1/errors/ja/ERR_ESI --- squid-3.4.4/errors/ja/ERR_ESI 2014-03-09 01:52:08.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESIの処理に失敗しました。

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ja/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ja/ERR_FORWARDING_DENIED 2014-03-09 01:52:09.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    転送は拒否されました。

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_DISABLED squid-3.4.4.1/errors/ja/ERR_FTP_DISABLED --- squid-3.4.4/errors/ja/ERR_FTP_DISABLED 2014-03-09 01:52:09.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTPは無効です。

    キャッシュは FTP をサポートしていません．

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_FAILURE squid-3.4.4.1/errors/ja/ERR_FTP_FAILURE --- squid-3.4.4/errors/ja/ERR_FTP_FAILURE 2014-03-09 01:52:10.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    FTPのプロトコル・エラーが、以下のURLから情報を得ようとしている間に発生しました: %U

    Squidは以下のFTPコマンドを送りました:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ja/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ja/ERR_FTP_FORBIDDEN 2014-03-09 01:52:11.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    FTP認証の失敗が、以下のURLから情報を得ようとしている間に発生しました: %U

    Squidは以下のFTPコマンドを送りました:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ja/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ja/ERR_FTP_NOT_FOUND 2014-03-09 01:52:11.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    以下のURLを取得できませんでした: %U

    Squidは以下のFTPコマンドを送りました:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ja/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ja/ERR_FTP_PUT_CREATED 2014-03-09 01:52:12.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    操作に成功

    ファイルを作成しました。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ja/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ja/ERR_FTP_PUT_ERROR 2014-03-09 01:52:12.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: FTP upload failed

    ERROR

    FTP PUT upload failed

    FTPのプロトコル・エラーが、以下のURLから情報を得ようとしている間に発生しました: %U

    Squidは以下のFTPコマンドを送りました:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ja/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ja/ERR_FTP_PUT_MODIFIED 2014-03-09 01:52:13.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    操作に成功

    ファイルを更新しました。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ja/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ja/ERR_FTP_UNAVAILABLE 2014-03-09 01:52:13.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    以下のURLを取得しようとしているとき、FTPサーバの負荷が高すぎました: %U

    Squidは以下のFTPコマンドを送りました:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ja/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ja/ERR_GATEWAY_FAILURE 2014-03-09 01:52:14.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ja/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ja/ERR_ICAP_FAILURE 2014-03-09 01:52:15.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAPのプロトコル・エラーです。

    システムが以下のエラーを返しました: %E

    This means that some aspect of the ICAP communication failed.

    ありそうな問題:

    • ICAPサーバに到達到達できません。

    • ICAPサーバから不正な応答がありました。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_INVALID_REQ squid-3.4.4.1/errors/ja/ERR_INVALID_REQ --- squid-3.4.4/errors/ja/ERR_INVALID_REQ 2014-03-09 01:52:15.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:

    %R

    ありそうな問題:

    • 要求の方法が抜けているか不明です。

    • URLがありません。

    • HTTPの識別子(HTTP/1.0)がありません。

    • リクエストが長すぎます。

    • POSTまたはPUTのリクエストにContent-Lengthヘッダがありません。

    • ホスト名に不正な文字が使われています: アンダースコアは使えません。

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_INVALID_RESP squid-3.4.4.1/errors/ja/ERR_INVALID_RESP --- squid-3.4.4/errors/ja/ERR_INVALID_RESP 2014-03-09 01:52:16.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_INVALID_URL squid-3.4.4.1/errors/ja/ERR_INVALID_URL --- squid-3.4.4/errors/ja/ERR_INVALID_URL 2014-03-09 01:52:16.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    不正なURL

    リクエストされたURLに不正な部分があります。

    ありそうな問題:

    • (http://または同類の)アクセス・プロトコルが抜けているか不正です。

    • ホスト名がありません。

    • 不正な二重のエスケープがURLパスにあります。

    • ホスト名に不正な文字が使われています: アンダースコアは使えません。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ja/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ja/ERR_LIFETIME_EXP 2014-03-09 01:52:17.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    接続の存続時間が終了しました。

    最大の接続有効時間が過ぎたため、Squidはリクエストを終了しました。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_NO_RELAY squid-3.4.4.1/errors/ja/ERR_NO_RELAY --- squid-3.4.4/errors/ja/ERR_NO_RELAY 2014-03-09 01:52:17.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Waisの中継先が指定されていません。

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ja/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ja/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:52:18.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    only-if-cached の指定がありましたが，その文書がキャッシュに存在していません．

    キャッシュへの only-if-cached つきリクエストがありましたが，この文書はキャッシュに存在していないか，あるいはすでにキャッシュにはあるが(only-if-cached によって禁止されている)この文書が更新されているかどうかの再確認が必要です．

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/error-details.txt squid-3.4.4.1/errors/ja/error-details.txt --- squid-3.4.4/errors/ja/error-details.txt 2014-03-09 01:52:25.000000000 -0800 +++ squid-3.4.4.1/errors/ja/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ja/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ja/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ja/ERR_PRECONDITION_FAILED 2014-03-09 01:52:18.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_READ_ERROR squid-3.4.4.1/errors/ja/ERR_READ_ERROR --- squid-3.4.4/errors/ja/ERR_READ_ERROR 2014-03-09 01:52:19.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    読み込みエラー

    システムが以下のエラーを返しました: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ja/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ja/ERR_READ_TIMEOUT 2014-03-09 01:52:19.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    読み込みタイムアウト

    システムが以下のエラーを返しました: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ja/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ja/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:52:20.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    %Iへの安全な接続を確立に失敗しました。

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ja/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ja/ERR_SHUTTING_DOWN 2014-03-09 01:52:21.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ja/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ja/ERR_SOCKET_FAILURE 2014-03-09 01:52:21.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ソケット作成に失敗

    システムが以下のエラーを返しました: %E

    おそらく過大な負荷のため、SquidはTCPソケットを作成できませんでした。再度リクエストしてください。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_TOO_BIG squid-3.4.4.1/errors/ja/ERR_TOO_BIG --- squid-3.4.4/errors/ja/ERR_TOO_BIG 2014-03-09 01:52:22.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    リクエストまたはリプライが大きすぎます。

    POSTまたはPUTの要求をしていたなら、アップロードしていた対象が大きすぎます。

    GETの要求をしていたなら、ダウンロードしようとしていた対象が大きすぎます。

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ja/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ja/ERR_UNSUP_HTTPVERSION 2014-03-09 01:52:23.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_UNSUP_REQ squid-3.4.4.1/errors/ja/ERR_UNSUP_REQ --- squid-3.4.4/errors/ja/ERR_UNSUP_REQ 2014-03-09 01:52:24.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    サポートされていないリクエスト/プロトコルです．

    Squidはすべてのプロトコルに対して、すべてのリクエスト方式をサポートしているわけではありません。例えば、POSTをGopherのリクエストで行うことはできません。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_URN_RESOLVE squid-3.4.4.1/errors/ja/ERR_URN_RESOLVE --- squid-3.4.4/errors/ja/ERR_URN_RESOLVE 2014-03-09 01:52:24.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: The requested URN could not be retrieved

    ERROR

    リクエストされたURNのURLを調べられませんでした。

    The following error was encountered while trying to retrieve the URN: %U

    URN の解決ができませんでした。

    やあ、%Tの時点でURNには多くを期待しないでください。:)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_WRITE_ERROR squid-3.4.4.1/errors/ja/ERR_WRITE_ERROR --- squid-3.4.4/errors/ja/ERR_WRITE_ERROR 2014-03-09 01:52:25.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    送信処理中にエラーが発生しました．

    システムが以下のエラーを返しました: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ja/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ja/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ja/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:52:25.000000000 -0800 +++ squid-3.4.4.1/errors/ja/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - エラー: リクエストされた URL は取得できませんでした

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    サイズがゼロの応答

    このリクエストにに対してSquidは何もデータを受け取りませんでした。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ko/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ko/ERR_ACCESS_DENIED 2014-03-09 01:52:26.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    서버 이용 요구가 거절되었습니다.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:52:26.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ko/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ko/ERR_AGENT_CONFIGURE 2014-03-09 01:52:27.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    에러

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_AGENT_WPAD squid-3.4.4.1/errors/ko/ERR_AGENT_WPAD --- squid-3.4.4/errors/ko/ERR_AGENT_WPAD 2014-03-09 01:52:28.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    에러

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ko/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ko/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:52:28.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: Cache Access Denied

    ERROR

    Cache 서버 이용 요구가 거절되었습니다.

    The following error was encountered while trying to retrieve the URL: %U

    캐쉬 이용 요청이 거절되었습니다.

    죄송합니다. 이 캐쉬를 통해 다음 서비스를 받기 위해서는 %U 인증절차를 거쳐야 합니다.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:52:29.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: Cache Manager Access Denied

    ERROR

    Cache Manager 서버 이용 요구가 거절되었습니다.

    The following error was encountered while trying to retrieve the URL: %U

    캐쉬 매니저 이용 요청이 거절되었습니다.

    죄송합니다. 이 캐쉬 매니저를 통해 다음 서비스를 받기 위해서는 %U 인증절차를 거쳐야 합니다.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ko/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ko/ERR_CANNOT_FORWARD 2014-03-09 01:52:29.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    현재로서는 이 요청을 진행 시킬 수 없습니다.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ko/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ko/ERR_CONFLICT_HOST 2014-03-09 01:52:30.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ko/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ko/ERR_CONNECT_FAIL 2014-03-09 01:52:31.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_DIR_LISTING squid-3.4.4.1/errors/ko/ERR_DIR_LISTING --- squid-3.4.4/errors/ko/ERR_DIR_LISTING 2014-03-09 01:52:31.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_DNS_FAIL squid-3.4.4.1/errors/ko/ERR_DNS_FAIL --- squid-3.4.4/errors/ko/ERR_DNS_FAIL 2014-03-09 01:52:32.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    %H 에 대해서 IP 주소를 찾을 수 없습니다.

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ESI squid-3.4.4.1/errors/ko/ERR_ESI --- squid-3.4.4/errors/ko/ERR_ESI 2014-03-09 01:52:32.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ko/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ko/ERR_FORWARDING_DENIED 2014-03-09 01:52:33.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    포워딩 불가

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_DISABLED squid-3.4.4.1/errors/ko/ERR_FTP_DISABLED --- squid-3.4.4/errors/ko/ERR_FTP_DISABLED 2014-03-09 01:52:33.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP 서비스가 불가능 합니다.

    FTP 서비스가 불가능 합니다.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_FAILURE squid-3.4.4.1/errors/ko/ERR_FTP_FAILURE --- squid-3.4.4/errors/ko/ERR_FTP_FAILURE 2014-03-09 01:52:34.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    다음 URL을 처리 하던 중 FTP 프로토콜 에러가 발생했습니다: %U

    Squid는 다음과 같은 FTP 명령어를 전송했고:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ko/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ko/ERR_FTP_FORBIDDEN 2014-03-09 01:52:34.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    다음 URL을 처리 하던 중 FTP 인증 문제가 발생했습니다: %U

    Squid는 다음과 같은 FTP 명령어를 전송했고:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ko/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ko/ERR_FTP_NOT_FOUND 2014-03-09 01:52:35.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    다음 URL이 처리되지 못했습니다: %U

    Squid는 다음과 같은 FTP 명령어를 전송했고:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ko/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ko/ERR_FTP_PUT_CREATED 2014-03-09 01:52:35.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    수행 완료

    파일이 생성되었습니다


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ko/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ko/ERR_FTP_PUT_ERROR 2014-03-09 01:52:36.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: FTP upload failed

    ERROR

    FTP PUT upload failed

    다음 URL을 처리 하던 중 FTP 프로토콜 에러가 발생했습니다: %U

    Squid는 다음과 같은 FTP 명령어를 전송했고:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ko/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ko/ERR_FTP_PUT_MODIFIED 2014-03-09 01:52:37.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    수행 완료

    파일이 변경되었습니다


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ko/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ko/ERR_FTP_UNAVAILABLE 2014-03-09 01:52:37.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid는 다음과 같은 FTP 명령어를 전송했고:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ko/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ko/ERR_GATEWAY_FAILURE 2014-03-09 01:52:38.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ko/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ko/ERR_ICAP_FAILURE 2014-03-09 01:52:38.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_INVALID_REQ squid-3.4.4.1/errors/ko/ERR_INVALID_REQ --- squid-3.4.4/errors/ko/ERR_INVALID_REQ 2014-03-09 01:52:39.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Request method가 잘못되었거나 빠져 있다.

    • URL이 빠져 있다.

    • HTTP Identifier (HTTP/1.0)이 빠져 있다.

    • Request가 너무 크다.

    • POST나 PUT 요청일 경우 Content-Length가 빠져 있다.

    • 호스트네임에 잘못 된 문자가 있다; 밑줄은 허용되지 않습니다.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_INVALID_RESP squid-3.4.4.1/errors/ko/ERR_INVALID_RESP --- squid-3.4.4/errors/ko/ERR_INVALID_RESP 2014-03-09 01:52:39.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_INVALID_URL squid-3.4.4.1/errors/ko/ERR_INVALID_URL --- squid-3.4.4/errors/ko/ERR_INVALID_URL 2014-03-09 01:52:40.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    잘못된 URL

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • 접속 프로토콜이 잘못되었거나 빠져 있다. (http:// 와 같은 방식으로 되어 있어야 합니다)

    • 호스트네임이 빠져 있다.

    • URL-Path에 double-escape이 있다.

    • 호스트네임에 잘못 된 문자가 있다; 밑줄은 허용되지 않습니다.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ko/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ko/ERR_LIFETIME_EXP 2014-03-09 01:52:40.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    접속 허용 시간이 경과되었습니다.

    최대 접속 허용 시간이 경과하여 Squid로부터의 요청이 중지되었습니다.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_NO_RELAY squid-3.4.4.1/errors/ko/ERR_NO_RELAY --- squid-3.4.4/errors/ko/ERR_NO_RELAY 2014-03-09 01:52:41.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    WAIS Relay가 없습니다.

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ko/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ko/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:52:41.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    캐쉬에 유효한 문서가 없고 only-if-cached 가 지정되었습니다.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/error-details.txt squid-3.4.4.1/errors/ko/error-details.txt --- squid-3.4.4/errors/ko/error-details.txt 2014-03-09 01:52:48.000000000 -0800 +++ squid-3.4.4.1/errors/ko/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ko/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ko/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ko/ERR_PRECONDITION_FAILED 2014-03-09 01:52:42.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_READ_ERROR squid-3.4.4.1/errors/ko/ERR_READ_ERROR --- squid-3.4.4/errors/ko/ERR_READ_ERROR 2014-03-09 01:52:43.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    읽기 에러

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ko/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ko/ERR_READ_TIMEOUT 2014-03-09 01:52:43.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    읽기 시간 초과

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ko/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ko/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:52:44.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ko/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ko/ERR_SHUTTING_DOWN 2014-03-09 01:52:44.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ko/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ko/ERR_SOCKET_FAILURE 2014-03-09 01:52:45.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    소켓 생성 실패

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    Squid가 TCP 소켓을 생성할 수 없습니다. 심한 로드로 인한 결과일 수 있습니다. 다시 시도해 주십시오.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_TOO_BIG squid-3.4.4.1/errors/ko/ERR_TOO_BIG --- squid-3.4.4/errors/ko/ERR_TOO_BIG 2014-03-09 01:52:45.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ko/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ko/ERR_UNSUP_HTTPVERSION 2014-03-09 01:52:46.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_UNSUP_REQ squid-3.4.4.1/errors/ko/ERR_UNSUP_REQ --- squid-3.4.4/errors/ko/ERR_UNSUP_REQ 2014-03-09 01:52:46.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    지원되지 않는 Request Method와 프로토콜입니다.

    Squid는 모든 접속 프로토콜에 대한 request method를 지원하지 않습니다. 한가지 예로, Gopher에서 POST request를 사용할 수 없습니다.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_URN_RESOLVE squid-3.4.4.1/errors/ko/ERR_URN_RESOLVE --- squid-3.4.4/errors/ko/ERR_URN_RESOLVE 2014-03-09 01:52:47.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    The following error was encountered while trying to retrieve the URN: %U

    URN을 처리할 수 없습니다.

    %T의 URN에 대해 너무 많은 것을 기대하지 마세요. :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_WRITE_ERROR squid-3.4.4.1/errors/ko/ERR_WRITE_ERROR --- squid-3.4.4/errors/ko/ERR_WRITE_ERROR 2014-03-09 01:52:47.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    쓰기 에러

    시스템은 아래와 같은 메시지를 보내왔습니다: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ko/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ko/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ko/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:52:48.000000000 -0800 +++ squid-3.4.4.1/errors/ko/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 에러: 요청된 URL을 가져올 수 없습니다.

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    크기가 0인 응답이 돌아왔습니다.

    Squid는 이 요청으로 부터 아무런 데이터도 받지 못했습니다.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ACCESS_DENIED squid-3.4.4.1/errors/lt/ERR_ACCESS_DENIED --- squid-3.4.4/errors/lt/ERR_ACCESS_DENIED 2014-03-09 01:52:49.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Priėjimas draudžiamas.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:52:49.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/lt/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/lt/ERR_AGENT_CONFIGURE 2014-03-09 01:52:50.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    KLAIDA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_AGENT_WPAD squid-3.4.4.1/errors/lt/ERR_AGENT_WPAD --- squid-3.4.4/errors/lt/ERR_AGENT_WPAD 2014-03-09 01:52:50.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    KLAIDA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/lt/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/lt/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:52:51.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Cache Access Denied

    ERROR

    Cache Priėjimas draudžiamas.

    The following error was encountered while trying to retrieve the URL: %U

    Priėjimas prie kešo uždraustas.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:52:51.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Cache Manager Access Denied

    ERROR

    Cache Manager Priėjimas draudžiamas.

    The following error was encountered while trying to retrieve the URL: %U

    Kešo menedžerio priėjimas uždraustas.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Prašome susisiekti su administratoriumi, jei jums iškilo problemos prisistatant arba, jei jūs esate administratorius, perskaitykite Squid documentaciją dėl kešo menedžerio interfeiso ir patikrinkite kešo žurnalą dėl detalesnių pranešimų apie klaidas.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/lt/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/lt/ERR_CANNOT_FORWARD 2014-03-09 01:52:52.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Šiuo metu negaliu persiųsti užklausos.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_CONFLICT_HOST squid-3.4.4.1/errors/lt/ERR_CONFLICT_HOST --- squid-3.4.4/errors/lt/ERR_CONFLICT_HOST 2014-03-09 01:52:52.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_CONNECT_FAIL squid-3.4.4.1/errors/lt/ERR_CONNECT_FAIL --- squid-3.4.4/errors/lt/ERR_CONNECT_FAIL 2014-03-09 01:52:53.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    Sistema atsakė: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_DIR_LISTING squid-3.4.4.1/errors/lt/ERR_DIR_LISTING --- squid-3.4.4/errors/lt/ERR_DIR_LISTING 2014-03-09 01:52:53.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_DNS_FAIL squid-3.4.4.1/errors/lt/ERR_DNS_FAIL --- squid-3.4.4/errors/lt/ERR_DNS_FAIL 2014-03-09 01:52:54.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Neįmanoma nustatyti %H serverio IP adreso

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ESI squid-3.4.4.1/errors/lt/ERR_ESI --- squid-3.4.4/errors/lt/ERR_ESI 2014-03-09 01:52:55.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/lt/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/lt/ERR_FORWARDING_DENIED 2014-03-09 01:52:55.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Pervedimo komanda neleistina.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_DISABLED squid-3.4.4.1/errors/lt/ERR_FTP_DISABLED --- squid-3.4.4/errors/lt/ERR_FTP_DISABLED 2014-03-09 01:52:56.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP yra atjungtas

    Šis proxy serveris nepalaiko FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_FAILURE squid-3.4.4.1/errors/lt/ERR_FTP_FAILURE --- squid-3.4.4/errors/lt/ERR_FTP_FAILURE 2014-03-09 01:52:56.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    Įvyko FTP protokolo klaida bandant atsiųsti puslapį: %U

    Squid nusiuntė šią FTP komandą:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/lt/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/lt/ERR_FTP_FORBIDDEN 2014-03-09 01:52:57.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    Nepavyko FTP prisistatymas bandant atsiųsti puslapį: %U

    Squid nusiuntė šią FTP komandą:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/lt/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/lt/ERR_FTP_NOT_FOUND 2014-03-09 01:52:58.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid nusiuntė šią FTP komandą:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/lt/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/lt/ERR_FTP_PUT_CREATED 2014-03-09 01:52:58.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacija buvo sėkminga

    Failas sukurtas


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/lt/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/lt/ERR_FTP_PUT_ERROR 2014-03-09 01:52:59.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: FTP upload failed

    ERROR

    FTP PUT upload failed

    Įvyko FTP protokolo klaida bandant atsiųsti puslapį: %U

    Squid nusiuntė šią FTP komandą:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/lt/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/lt/ERR_FTP_PUT_MODIFIED 2014-03-09 01:53:00.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacija buvo sėkminga

    Failas atnaujintas


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/lt/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/lt/ERR_FTP_UNAVAILABLE 2014-03-09 01:53:00.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    FTP serveris buvo užimtas bandant atsiųsti puslapį: %U

    Squid nusiuntė šią FTP komandą:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/lt/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/lt/ERR_GATEWAY_FAILURE 2014-03-09 01:53:01.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ICAP_FAILURE squid-3.4.4.1/errors/lt/ERR_ICAP_FAILURE --- squid-3.4.4/errors/lt/ERR_ICAP_FAILURE 2014-03-09 01:53:01.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    Sistema atsakė: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_INVALID_REQ squid-3.4.4.1/errors/lt/ERR_INVALID_REQ --- squid-3.4.4/errors/lt/ERR_INVALID_REQ 2014-03-09 01:53:02.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Trūksta arba nežinomas užklausos metodas

    • Trūksta adreso

    • Trūksta HTTP identifikatoriaus (HTTP/1.0)

    • Užklausa per didelė

    • Trūksta Content-Length parametro POST arba PUT užklausoje

    • Neleistinas simbolis serverio varde; pabraukimo simboliai yra neleistini

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_INVALID_RESP squid-3.4.4.1/errors/lt/ERR_INVALID_RESP --- squid-3.4.4/errors/lt/ERR_INVALID_RESP 2014-03-09 01:53:02.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    Iš serverio gautas nesuprantamas HTTP atsakymas arba jis buvo klaidingai suformuotas. Susisiekite su serverio operatoriumi. Jūsų proxy serverio administratorius gali suteikti jums daugiau informacijos apie šią problemą.

    Jūsų proxy serverio administratorius gali suteikti jums daugiau informacijos apie šią problemą.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_INVALID_URL squid-3.4.4.1/errors/lt/ERR_INVALID_URL --- squid-3.4.4/errors/lt/ERR_INVALID_URL 2014-03-09 01:53:03.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Klaidingas adresas

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Trūksta arba klaidingas protokolas (turetų būti http:// ar panašus)

    • Trūksta serverio vardo

    • Neleistinas double-escape kodas adrese

    • Neleistinas simbolis serverio varde; pabraukimo simboliai yra neleistini

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_LIFETIME_EXP squid-3.4.4.1/errors/lt/ERR_LIFETIME_EXP --- squid-3.4.4/errors/lt/ERR_LIFETIME_EXP 2014-03-09 01:53:04.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Ryšio trukmės laiko pabaiga

    Squid nutraukė užklausą, kadangi ji viršijo maksimalią ryšio trukmės reikšmę.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_NO_RELAY squid-3.4.4.1/errors/lt/ERR_NO_RELAY --- squid-3.4.4/errors/lt/ERR_NO_RELAY 2014-03-09 01:53:04.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nėra Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/lt/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/lt/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:53:05.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Tinkamas dokumentas nerastas proxy serveryje ir only-if-cached komanda buvo nurodyta.

    Jūs davėte užklausą su only-if-cached proxy kontrolės komanda. Dokumentas nerastas serveryje, arba jis pareikalavopatvirtinimo uždrausto only-if-cached komandos.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/error-details.txt squid-3.4.4.1/errors/lt/error-details.txt --- squid-3.4.4/errors/lt/error-details.txt 2014-03-09 01:53:11.000000000 -0800 +++ squid-3.4.4.1/errors/lt/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/lt/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/lt/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/lt/ERR_PRECONDITION_FAILED 2014-03-09 01:53:05.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_READ_ERROR squid-3.4.4.1/errors/lt/ERR_READ_ERROR --- squid-3.4.4/errors/lt/ERR_READ_ERROR 2014-03-09 01:53:06.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Skaitymo klaida

    Sistema atsakė: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_READ_TIMEOUT squid-3.4.4.1/errors/lt/ERR_READ_TIMEOUT --- squid-3.4.4/errors/lt/ERR_READ_TIMEOUT 2014-03-09 01:53:06.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Leistino skaitymo laiko pabaiga

    Sistema atsakė: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/lt/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/lt/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:53:07.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/lt/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/lt/ERR_SHUTTING_DOWN 2014-03-09 01:53:07.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/lt/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/lt/ERR_SOCKET_FAILURE 2014-03-09 01:53:08.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Socket klaida

    Sistema atsakė: %E

    Squid negalėjo sukurti TCP socket, greičiausiai dėl per didelio apkrovimo. Prašome pakartoti savo užklausą.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_TOO_BIG squid-3.4.4.1/errors/lt/ERR_TOO_BIG --- squid-3.4.4/errors/lt/ERR_TOO_BIG 2014-03-09 01:53:09.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Užklausa arba atsakymas yra per dideli.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/lt/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/lt/ERR_UNSUP_HTTPVERSION 2014-03-09 01:53:09.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_UNSUP_REQ squid-3.4.4.1/errors/lt/ERR_UNSUP_REQ --- squid-3.4.4/errors/lt/ERR_UNSUP_REQ 2014-03-09 01:53:10.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nepalaikomas užklausos metodas ir protokolas

    Squid palaiko ne visus užklausos metodus daliai protokolų. Pavyzdžiui, jūs negalite vykdyti POST Gopher tipo užklausoje.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_URN_RESOLVE squid-3.4.4.1/errors/lt/ERR_URN_RESOLVE --- squid-3.4.4/errors/lt/ERR_URN_RESOLVE 2014-03-09 01:53:10.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    The following error was encountered while trying to retrieve the URN: %U

    Negaliu aptikti URN

    Mielieji, siūlau daug nesitikėti iš URNų %T :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_WRITE_ERROR squid-3.4.4.1/errors/lt/ERR_WRITE_ERROR --- squid-3.4.4/errors/lt/ERR_WRITE_ERROR 2014-03-09 01:53:11.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Rašymo klaida

    Sistema atsakė: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lt/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/lt/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/lt/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:53:11.000000000 -0800 +++ squid-3.4.4.1/errors/lt/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Atsakymas nulinis

    Squid negavo jokių duomenų šiai užklausai.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ACCESS_DENIED squid-3.4.4.1/errors/lv/ERR_ACCESS_DENIED --- squid-3.4.4/errors/lv/ERR_ACCESS_DENIED 2014-03-09 01:53:12.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Pieeja liegta

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:53:13.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/lv/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/lv/ERR_AGENT_CONFIGURE 2014-03-09 01:53:13.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    Kļūda

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_AGENT_WPAD squid-3.4.4.1/errors/lv/ERR_AGENT_WPAD --- squid-3.4.4/errors/lv/ERR_AGENT_WPAD 2014-03-09 01:53:14.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    Kļūda

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/lv/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/lv/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:53:14.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Cache Access Denied

    ERROR

    Cache Pieeja liegta

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Kešatmiņas pieeja liegta

    Atvainojiet, Jums nav atļauts pieprasīt %U no kešatmiņas pirms neesat autentificējies.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:53:15.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Cache Manager Access Denied

    ERROR

    Cache Manager Pieeja liegta

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Kešatmiņas pārvaldniekam pieeja liegta.

    Atvainojiet, Pirms Jūs neesiet autorizējies nav atļauts pieprasīt %U no kešatmiņas pārvaldnieka.

    Lūdzu sazinieties ar kešatmiņas administratoru, ja Jums ir problēmas ar autentificēšanos vai, ja Jūs esat administrators, lasiet Squid dokumentāciju kešatmiņas pārvaldnieka saskarnē, detalizētāku kļūdas aprakstu meklējiet kļūdu žurnālos.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/lv/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/lv/ERR_CANNOT_FORWARD 2014-03-09 01:53:16.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Šobrīda nav iespējams pārsūtīt šo pieprasījumu.

    This request could not be forwarded to the origin server or to any parent caches.

    Dažas iespējamās problēmas ir:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_CONFLICT_HOST squid-3.4.4.1/errors/lv/ERR_CONFLICT_HOST --- squid-3.4.4/errors/lv/ERR_CONFLICT_HOST 2014-03-09 01:53:16.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Dažas iespējamās problēmas ir:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_CONNECT_FAIL squid-3.4.4.1/errors/lv/ERR_CONNECT_FAIL --- squid-3.4.4/errors/lv/ERR_CONNECT_FAIL 2014-03-09 01:53:17.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Neveiksmīgs savienojums ar %I.

    Sistēma atbildēja: %E

    The remote host or network may be down. Please try the request again.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_DIR_LISTING squid-3.4.4.1/errors/lv/ERR_DIR_LISTING --- squid-3.4.4/errors/lv/ERR_DIR_LISTING 2014-03-09 01:53:17.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directorijs: %U

    Directory: %U/

    Directorija saturs:

    %z
    %g
    Vecākdirektorijs (Saknes direktorijs)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_DNS_FAIL squid-3.4.4.1/errors/lv/ERR_DNS_FAIL --- squid-3.4.4/errors/lv/ERR_DNS_FAIL 2014-03-09 01:53:18.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Nevar nosakidrot IP adresi no saimniekdatora vārda%H

    DNS serveris atgrieza:

    %z

    Tas nozīmē, ka kešatmiņa nevar atrast adresē ietverto saimniekdatora vārdu. Pārbaudiet vai adrese ir korekta.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ESI squid-3.4.4.1/errors/lv/ERR_ESI --- squid-3.4.4/errors/lv/ERR_ESI 2014-03-09 01:53:18.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Neveiksmīga ESI apstrāde.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Jūsu tīmekļa pārzinis ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/lv/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/lv/ERR_FORWARDING_DENIED 2014-03-09 01:53:19.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Pārsūtīšana aizliegta.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_DISABLED squid-3.4.4.1/errors/lv/ERR_FTP_DISABLED --- squid-3.4.4/errors/lv/ERR_FTP_DISABLED 2014-03-09 01:53:20.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    FTP nav atļauts

    Šī kešatmiņa neatbalsta FTP.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_FAILURE squid-3.4.4.1/errors/lv/ERR_FTP_FAILURE --- squid-3.4.4/errors/lv/ERR_FTP_FAILURE 2014-03-09 01:53:20.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Notikusi FTP protokola kļūda mēģinot atvērt vietrādi URL:%U

    Squid nosūtījis sekojošu FTP komandu:

    %f

    Serveris atbildēja ar:

    %F
    %g

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/lv/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/lv/ERR_FTP_FORBIDDEN 2014-03-09 01:53:21.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Mēģinot atvērt vietrādi URL: %U notikusi FTP autentifikācijas kļūda

    Squid nosūtījis sekojošu FTP komandu:

    %f

    Serveris atbildēja ar:

    %F
    %g

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/lv/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/lv/ERR_FTP_NOT_FOUND 2014-03-09 01:53:21.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Nevar atvērt sekojošu adresi: %U

    Squid nosūtījis sekojošu FTP komandu:

    %f

    Serveris atbildēja ar:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/lv/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/lv/ERR_FTP_PUT_CREATED 2014-03-09 01:53:22.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operācija veiksmīga

    Datne izveidota


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/lv/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/lv/ERR_FTP_PUT_ERROR 2014-03-09 01:53:22.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: FTP upload failed

    ERROR

    FTP PUT upload failed

    Notikusi FTP protokola kļūda mēģinot atvērt vietrādi URL:%U

    Squid nosūtījis sekojošu FTP komandu:

    %f

    Serveris atbildēja ar:

    %F

    Tas nozīmē, ka FTP serverim nav tiesības vai vieta lai saglabātu datni. Pārbaudiet ceļu, tiesības, brīvo vietu un mēģiniet vēlreiz.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/lv/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/lv/ERR_FTP_PUT_MODIFIED 2014-03-09 01:53:23.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operācija veiksmīga

    Datne augšupielādēta


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/lv/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/lv/ERR_FTP_UNAVAILABLE 2014-03-09 01:53:23.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    FTP serveris ir pārslogots atverot vietrādi URL: %U

    Squid nosūtījis sekojošu FTP komandu:

    %f

    Serveris atbildēja ar:

    %F
    %g

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/lv/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/lv/ERR_GATEWAY_FAILURE 2014-03-09 01:53:24.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ICAP_FAILURE squid-3.4.4.1/errors/lv/ERR_ICAP_FAILURE --- squid-3.4.4/errors/lv/ERR_ICAP_FAILURE 2014-03-09 01:53:25.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    ICAP protokola kļūda.

    Sistēma atbildēja: %E

    Tas nozīmē, ka ir problēmas ar ICAP komunikācijas niansēm.

    Dažas iespējamās problēmas ir:

    • ICAP serveris nav pieejams.

    • Saņemta nekorekta atbilde no ICAP servera


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_INVALID_REQ squid-3.4.4.1/errors/lv/ERR_INVALID_REQ --- squid-3.4.4/errors/lv/ERR_INVALID_REQ 2014-03-09 01:53:25.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Nekorekts pieprasījums notikusi kļūda mēģinot apstrādāt pieprasījumu:

    %R

    Dažas iespējamās problēmas ir:

    • Nav vai ir nezināma pieprasījuma metode.

    • Pazudis URL.

    • pietrūkst HTTP identifikators (HTTP/1.0).

    • Pieprasījums ir par lielu.

    • Content-Length missing for POST or PUT requests.

    • Neatļauts simbols adresē. Pasvītrojuma rakstzīme nav atļauta.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_INVALID_RESP squid-3.4.4.1/errors/lv/ERR_INVALID_RESP --- squid-3.4.4/errors/lv/ERR_INVALID_RESP 2014-03-09 01:53:26.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Nekorekta atbilde notikusi kļūda mēģinot apstrādāt pieprasījumu:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Ja nepieciešams, Jūsu kešatmiņas administrators Jums var precīzāk izklāstīt problēmas detaļas.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_INVALID_URL squid-3.4.4.1/errors/lv/ERR_INVALID_URL --- squid-3.4.4/errors/lv/ERR_INVALID_URL 2014-03-09 01:53:26.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Nepareizs URL

    dažas nianses pieprasītajā adresē ir nekorektas.

    Dažas iespējamās problēmas ir:

    • Nav vai ir nekorekts pieejas protokols (jābūt http:// vai kam līdzīgam)

    • Nav saimniekdatora vārda

    • Adresē ir divas atsoļa rakstzīmes, kas ir aizliegtas

    • Neatļauts simbols adresē. Pasvītrojuma rakstzīme nav atļauta.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_LIFETIME_EXP squid-3.4.4.1/errors/lv/ERR_LIFETIME_EXP --- squid-3.4.4/errors/lv/ERR_LIFETIME_EXP 2014-03-09 01:53:27.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Savienojuma sesija beigusies

    Squid ir pārtraucis pieprasījumu, jo ir beigusies savienojuma sesija.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_NO_RELAY squid-3.4.4.1/errors/lv/ERR_NO_RELAY --- squid-3.4.4/errors/lv/ERR_NO_RELAY 2014-03-09 01:53:27.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Nav WAIS retranslācija

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/lv/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/lv/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:53:28.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Kešatmiņā nav atrasts derīgs dokuments un tiek piemērota direktīva only-if-cached .

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/error-details.txt squid-3.4.4.1/errors/lv/error-details.txt --- squid-3.4.4/errors/lv/error-details.txt 2014-03-09 01:53:34.000000000 -0800 +++ squid-3.4.4.1/errors/lv/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/lv/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/lv/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/lv/ERR_PRECONDITION_FAILED 2014-03-09 01:53:28.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_READ_ERROR squid-3.4.4.1/errors/lv/ERR_READ_ERROR --- squid-3.4.4/errors/lv/ERR_READ_ERROR 2014-03-09 01:53:29.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Lasīšanas kļūda

    Sistēma atbildēja: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_READ_TIMEOUT squid-3.4.4.1/errors/lv/ERR_READ_TIMEOUT --- squid-3.4.4/errors/lv/ERR_READ_TIMEOUT 2014-03-09 01:53:29.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Lasīšanas noildze

    Sistēma atbildēja: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/lv/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/lv/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:53:30.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Neizdevās izveidot drošu savienojumu ar %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/lv/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/lv/ERR_SHUTTING_DOWN 2014-03-09 01:53:30.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/lv/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/lv/ERR_SOCKET_FAILURE 2014-03-09 01:53:31.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Savienojuma kļūda

    Sistēma atbildēja: %E

    Squid nevar izveidot TCP soketu, iespējams dēļ lielās slodzes. Lūdzu atkārtojiet Jūsu pieprasījumu.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_TOO_BIG squid-3.4.4.1/errors/lv/ERR_TOO_BIG --- squid-3.4.4/errors/lv/ERR_TOO_BIG 2014-03-09 01:53:32.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Pieprasījums vai atbilde ir par lielu.

    Ja Jūs veiciet POST vai PUT pieprasījumu, tad vienums, kuru Jūs mēģiniet augšupieladēt ir par lielu.

    Ja Jūs veiciet GET pieprasījumu, tad vienums, kuru Jūs mēģiniet lejupielādēt ir par lielu.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/lv/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/lv/ERR_UNSUP_HTTPVERSION 2014-03-09 01:53:32.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    Neatbalstīta HTTP versija

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Unsupported HTTP version

    Šis Squid neatbalsta HTTP versiju, kuru Jūs mēģiniet lietot.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_UNSUP_REQ squid-3.4.4.1/errors/lv/ERR_UNSUP_REQ --- squid-3.4.4/errors/lv/ERR_UNSUP_REQ 2014-03-09 01:53:33.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Neatbalstīta pieprasījuma metode un protokols

    Squid neatbalsta visas pieprasījuma metodes visiem protokoliem. Piemēram, Jūs nevarat veikt POST pieprasījumu izmantojot Gopher protokolu.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_URN_RESOLVE squid-3.4.4.1/errors/lv/ERR_URN_RESOLVE --- squid-3.4.4/errors/lv/ERR_URN_RESOLVE 2014-03-09 01:53:33.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Cannot Resolve URN

    Hi, neiaizraujies par daudz ar %T :)

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_WRITE_ERROR squid-3.4.4.1/errors/lv/ERR_WRITE_ERROR --- squid-3.4.4/errors/lv/ERR_WRITE_ERROR 2014-03-09 01:53:34.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Rakstīšanas kļūda

    Sistēma atbildēja: %E

    An error condition occurred while writing to the network. Please retry your request.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/lv/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/lv/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/lv/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:53:34.000000000 -0800 +++ squid-3.4.4.1/errors/lv/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Kļūda: Nevar atvērt pieprasīto adresi.

    ERROR

    The requested URL could not be retrieved

    Iestājusies sekojoša kļūda mēģinot atvērt adresi: %U

    Nulles izmēra atbilde

    Squid nav saņēmis nekādus datus šim pieprasījumam.

    Jūsu kešatmiņas administrators ir %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/Makefile.in squid-3.4.4.1/errors/Makefile.in --- squid-3.4.4/errors/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/errors/Makefile.in 2014-04-23 05:51:00.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,8 +77,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/language.list $(srcdir)/template.list +DIST_COMMON = $(srcdir)/template.list $(srcdir)/language.list \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = errors ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ @@ -44,7 +88,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -99,13 +143,32 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -144,6 +207,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -161,6 +225,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -198,11 +263,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -261,6 +328,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -441,6 +509,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/template.list $(srcdir)/language.list: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -456,11 +525,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -510,10 +579,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -593,17 +667,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - dist-hook distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-exec-local install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + cscopelist-am ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-local all: all-am diff -u -r -N squid-3.4.4/errors/ms/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ms/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ms/ERR_ACCESS_DENIED 2014-03-09 01:53:35.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Akses Disekat

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:53:36.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ms/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ms/ERR_AGENT_CONFIGURE 2014-03-09 01:53:36.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    RALAT

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_AGENT_WPAD squid-3.4.4.1/errors/ms/ERR_AGENT_WPAD --- squid-3.4.4/errors/ms/ERR_AGENT_WPAD 2014-03-09 01:53:37.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    RALAT

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ms/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ms/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:53:37.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: Cache Access Denied

    ERROR

    Cache Akses Disekat

    The following error was encountered while trying to retrieve the URL: %U

    Akses ke Cache disekat

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:53:38.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: Cache Manager Access Denied

    ERROR

    Cache Manager Akses Disekat

    The following error was encountered while trying to retrieve the URL: %U

    Cache Manager Access Denied.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ms/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ms/ERR_CANNOT_FORWARD 2014-03-09 01:53:38.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ms/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ms/ERR_CONFLICT_HOST 2014-03-09 01:53:39.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ms/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ms/ERR_CONNECT_FAIL 2014-03-09 01:53:39.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Sambungan ke %I gagal.

    The system returned: %E

    The remote host or network may be down. Please try the request again.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_DIR_LISTING squid-3.4.4.1/errors/ms/ERR_DIR_LISTING --- squid-3.4.4/errors/ms/ERR_DIR_LISTING 2014-03-09 01:53:40.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Direktori: %U

    Directory: %U/

    Kandungan direktori

    %z
    %g
    Direktori Utama (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_DNS_FAIL squid-3.4.4.1/errors/ms/ERR_DNS_FAIL --- squid-3.4.4/errors/ms/ERR_DNS_FAIL 2014-03-09 01:53:40.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_ESI squid-3.4.4.1/errors/ms/ERR_ESI --- squid-3.4.4/errors/ms/ERR_ESI 2014-03-09 01:53:41.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Webmaster anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ms/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ms/ERR_FORWARDING_DENIED 2014-03-09 01:53:42.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Forwarding Denied.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_DISABLED squid-3.4.4.1/errors/ms/ERR_FTP_DISABLED --- squid-3.4.4/errors/ms/ERR_FTP_DISABLED 2014-03-09 01:53:42.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP telah dimatikan

    This cache does not support FTP.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_FAILURE squid-3.4.4.1/errors/ms/ERR_FTP_FAILURE --- squid-3.4.4/errors/ms/ERR_FTP_FAILURE 2014-03-09 01:53:43.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ms/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ms/ERR_FTP_FORBIDDEN 2014-03-09 01:53:43.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ms/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ms/ERR_FTP_NOT_FOUND 2014-03-09 01:53:44.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ms/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ms/ERR_FTP_PUT_CREATED 2014-03-09 01:53:44.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operasi Berjaya

    Fail dicipta


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ms/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ms/ERR_FTP_PUT_ERROR 2014-03-09 01:53:45.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: FTP upload failed

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ms/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ms/ERR_FTP_PUT_MODIFIED 2014-03-09 01:53:45.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operasi Berjaya

    Fail dikemaskini


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ms/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ms/ERR_FTP_UNAVAILABLE 2014-03-09 01:53:46.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ms/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ms/ERR_GATEWAY_FAILURE 2014-03-09 01:53:46.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ms/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ms/ERR_ICAP_FAILURE 2014-03-09 01:53:47.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    The system returned: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • Respon yang salah diterima dari pelayan ICAP


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_INVALID_REQ squid-3.4.4.1/errors/ms/ERR_INVALID_REQ --- squid-3.4.4/errors/ms/ERR_INVALID_REQ 2014-03-09 01:53:48.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Permintaan Salah error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Missing or unknown request method.

    • URL Hilang

    • Kehilangan HTTP Identifier (HTTP/1.0)

    • Permintaan terlalu besar

    • Content-Length missing for POST or PUT requests.

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_INVALID_RESP squid-3.4.4.1/errors/ms/ERR_INVALID_RESP --- squid-3.4.4/errors/ms/ERR_INVALID_RESP 2014-03-09 01:53:48.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Respon Salah error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_INVALID_URL squid-3.4.4.1/errors/ms/ERR_INVALID_URL --- squid-3.4.4/errors/ms/ERR_INVALID_URL 2014-03-09 01:53:49.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URL Salah

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Missing or incorrect access protocol (should be http:// or similar)

    • Nama Host Hilang

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ms/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ms/ERR_LIFETIME_EXP 2014-03-09 01:53:49.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection Lifetime Expired

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_NO_RELAY squid-3.4.4.1/errors/ms/ERR_NO_RELAY --- squid-3.4.4/errors/ms/ERR_NO_RELAY 2014-03-09 01:53:50.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ms/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ms/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:53:51.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/error-details.txt squid-3.4.4.1/errors/ms/error-details.txt --- squid-3.4.4/errors/ms/error-details.txt 2014-03-09 01:54:00.000000000 -0800 +++ squid-3.4.4.1/errors/ms/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ms/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ms/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ms/ERR_PRECONDITION_FAILED 2014-03-09 01:53:51.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_READ_ERROR squid-3.4.4.1/errors/ms/ERR_READ_ERROR --- squid-3.4.4/errors/ms/ERR_READ_ERROR 2014-03-09 01:53:52.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Error

    The system returned: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ms/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ms/ERR_READ_TIMEOUT 2014-03-09 01:53:53.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Timeout

    The system returned: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ms/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ms/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:53:54.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gagal membuat sambungan selamat ke %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ms/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ms/ERR_SHUTTING_DOWN 2014-03-09 01:53:55.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ms/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ms/ERR_SOCKET_FAILURE 2014-03-09 01:53:55.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Kegagalan Socket

    The system returned: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_TOO_BIG squid-3.4.4.1/errors/ms/ERR_TOO_BIG --- squid-3.4.4/errors/ms/ERR_TOO_BIG 2014-03-09 01:53:56.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ms/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ms/ERR_UNSUP_HTTPVERSION 2014-03-09 01:53:57.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_UNSUP_REQ squid-3.4.4.1/errors/ms/ERR_UNSUP_REQ --- squid-3.4.4/errors/ms/ERR_UNSUP_REQ 2014-03-09 01:53:57.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported Request Method and Protocol

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_URN_RESOLVE squid-3.4.4.1/errors/ms/ERR_URN_RESOLVE --- squid-3.4.4/errors/ms/ERR_URN_RESOLVE 2014-03-09 01:53:58.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URN could not be retrieved

    ERROR

    URL yang diminta tidak dapat dimuaturun

    The following error was encountered while trying to retrieve the URN: %U

    Cannot Resolve URN

    Hey, don't expect too much from URNs on %T :)

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_WRITE_ERROR squid-3.4.4.1/errors/ms/ERR_WRITE_ERROR --- squid-3.4.4/errors/ms/ERR_WRITE_ERROR 2014-03-09 01:53:59.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Kegagalan Menulis

    The system returned: %E

    An error condition occurred while writing to the network. Please retry your request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ms/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ms/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ms/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:53:59.000000000 -0800 +++ squid-3.4.4.1/errors/ms/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - RALAT: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid did not receive any data for this request.

    Pengurus Proxy anda ialah %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ACCESS_DENIED squid-3.4.4.1/errors/nl/ERR_ACCESS_DENIED --- squid-3.4.4/errors/nl/ERR_ACCESS_DENIED 2014-03-09 01:54:00.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Toegang niet toegestaan.

    U heeft geen toegang tot de URL die u probeerde op te vragen van deze server. Neem contact op met uw service provider als u denkt dat dit niet klopt.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:54:01.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Deze grootte-beperkingen zijn ingesteld door de beheerder van deze cache. Neem contact op met de beheerder van deze cache, wanneer U van mening bent dat deze beperking onjuist is.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/nl/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/nl/ERR_AGENT_CONFIGURE 2014-03-09 01:54:01.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuratie

    FOUT

    Web Browser Configuration

    Uw Browser instellingen dienen te worden aangepast om dit netwerk te kunnen gebruiken.

    Hoe kunt u deze instellingen in uw browser vinden:

    Voor Firefox browsers ga naar:
    • Configuratie -> Internet Opties -> Geavanceerd -> Netwerk ->LAN Instellingen
    • In the HTTP proxy box type the proxy name %h and port %b.
    Voor Internet Explorer browsers ga naar:
    • Configuratie -> Internet Opties -> Verbinding -> LAN Instellingen ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Voor Opera browsers ga naar:
    • Configuratie ->Voorkeursinstellingen -> Geavanceerd -> Netwerk ->Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_AGENT_WPAD squid-3.4.4.1/errors/nl/ERR_AGENT_WPAD --- squid-3.4.4/errors/nl/ERR_AGENT_WPAD 2014-03-09 01:54:02.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuratie

    FOUT

    Web Browser Configuration

    Uw Browser instellingen dienen te worden aangepast om dit netwerk te kunnen gebruiken.

    Hoe kunt u deze instellingen in uw browser vinden:

    Voor Firefox browsers ga naar:
    • Configuratie -> Internet Opties -> Geavanceerd -> Netwerk ->LAN Instellingen
    • Select Auto-detect proxy settings for this network
    Voor Internet Explorer browsers ga naar:
    • Configuratie -> Internet Opties -> Verbinding -> LAN Instellingen ->Proxy
    • Selecteer: Instellingen automatisch detecteren
    Voor Opera browsers ga naar:
    • Configuratie ->Voorkeursinstellingen -> Geavanceerd -> Netwerk ->Proxy Servers
    • Selecteer: Gebruik automatisch proxy configuratie

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/nl/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/nl/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:54:03.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Cache Access Denied

    ERROR

    Cache Toegang niet toegestaan.

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Cache toegang niet toegestaan.

    Sorry, het is u niet toegestaan om %U van deze cache op te vragen totdat u zich geidentificeerd hebt.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:54:03.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: Cache Manager Access Denied

    ERROR

    Cache Manager Toegang niet toegestaan.

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Cache Manager toegang niet toegestaan.

    Sorry, het is u momenteel niet toegestaan om %U op te vragen via deze cache manager totdat u zichzelf hebt geauthenticeerd.

    Neem contact op met de cache beheerder als u problemen heeft met authenticatie. Als U de beheerder bent, lees dan de Squid documentatie over de cache manager interface en lees de cache log voor meer gedetailleerde foutmeldingen.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/nl/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/nl/ERR_CANNOT_FORWARD 2014-03-09 01:54:04.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Momenteel niet in staat dit verzoek door te sturen.

    This request could not be forwarded to the origin server or to any parent caches.

    Mogelijke problemen zijn:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_CONFLICT_HOST squid-3.4.4.1/errors/nl/ERR_CONFLICT_HOST --- squid-3.4.4/errors/nl/ERR_CONFLICT_HOST 2014-03-09 01:54:04.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Mogelijke problemen zijn:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_CONNECT_FAIL squid-3.4.4.1/errors/nl/ERR_CONNECT_FAIL --- squid-3.4.4/errors/nl/ERR_CONNECT_FAIL 2014-03-09 01:54:05.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Verbinding met %I mislukt.

    Het systeem gaf als antwoord: %E

    De server of het netwerk dat u probeert te benaderen is onbereikbaar. Probeer het later nog eens..

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_DIR_LISTING squid-3.4.4.1/errors/nl/ERR_DIR_LISTING --- squid-3.4.4/errors/nl/ERR_DIR_LISTING 2014-03-09 01:54:05.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Map: %U

    Map: %U/

    Map Inhoud:

    %z
    %g
    Hogere Map (Hoofd Map)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_DNS_FAIL squid-3.4.4.1/errors/nl/ERR_DNS_FAIL --- squid-3.4.4/errors/nl/ERR_DNS_FAIL 2014-03-09 01:54:06.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Niet in staat om het IP adres te bepalen van server %H

    De DNS server heeft geantwoord:

    %z

    Dit betekent dat de cache niet in staat was om de hostnaam uit de URL te herleiden. Controleer of de naam klopt.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ESI squid-3.4.4.1/errors/nl/ERR_ESI --- squid-3.4.4/errors/nl/ERR_ESI 2014-03-09 01:54:07.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    ESI processing mislukt.

    De ESI processor heeft geantwoord: 

    %Z

    Dit betekent dat de vervanger niet in staat was om de ESI template te bewerken. Geef deze fout door aan de webmaster, asltublieft.

    Uw cachebeheerder is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/nl/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/nl/ERR_FORWARDING_DENIED 2014-03-09 01:54:07.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Doorsturen niet toegestaan.

    Deze cache zal uw verzoek niet doorsturen, omdat het een sibling relatie tracht te bewerkstelligen. Wellicht dat de client op %i een fout ingestelde cache is.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_DISABLED squid-3.4.4.1/errors/nl/ERR_FTP_DISABLED --- squid-3.4.4/errors/nl/ERR_FTP_DISABLED 2014-03-09 01:54:08.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    FTP is uitgeschakeld

    Deze cache ondersteunt geen FTP.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_FAILURE squid-3.4.4.1/errors/nl/ERR_FTP_FAILURE --- squid-3.4.4/errors/nl/ERR_FTP_FAILURE 2014-03-09 01:54:08.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    Er is een FTP protocolfout opgetreden tijdens het ophalen van de URL: %U

    Squid heeft de volgende FTP opdracht verstuurd:

    %f

    De server antwoordde met:

    %F
    %g

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/nl/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/nl/ERR_FTP_FORBIDDEN 2014-03-09 01:54:09.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De FTP authenticatie is mislukt tijdens het openen van URL: %U

    Squid heeft de volgende FTP opdracht verstuurd:

    %f

    De server antwoordde met:

    %F
    %g

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/nl/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/nl/ERR_FTP_NOT_FOUND 2014-03-09 01:54:09.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende URL kon niet worden opgehaald: %U

    Squid heeft de volgende FTP opdracht verstuurd:

    %f

    De server antwoordde met:

    %F
    %g

    Dit kan veroorzaakt worden door een FTP URL met een absoluut pad (hetgeen niet in overeenstemming is met RFC 1738). Als dit de oorzaak is, dan kan het bestand gevonden worden op %B.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/nl/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/nl/ERR_FTP_PUT_CREATED 2014-03-09 01:54:10.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Bewerking succesvol

    Bestand aangemaakt


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/nl/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/nl/ERR_FTP_PUT_ERROR 2014-03-09 01:54:11.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: FTP upload failed

    ERROR

    FTP PUT upload failed

    Er is een FTP protocolfout opgetreden tijdens het ophalen van de URL: %U

    Squid heeft de volgende FTP opdracht verstuurd:

    %f

    De server antwoordde met:

    %F

    Dit betekent dat de FTP server geen toegang of opslagcapaciteit heeft om het bestand op te slaan. Controleer het pad, de rechten en opslagcapaciteit en probeer het opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/nl/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/nl/ERR_FTP_PUT_MODIFIED 2014-03-09 01:54:11.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Bewerking succesvol

    Bestand vernieuwd


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/nl/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/nl/ERR_FTP_UNAVAILABLE 2014-03-09 01:54:12.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De FTP server was overbelast tijdens het opvragen van de URL: %U

    Squid heeft de volgende FTP opdracht verstuurd:

    %f

    De server antwoordde met:

    %F
    %g

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/nl/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/nl/ERR_GATEWAY_FAILURE 2014-03-09 01:54:12.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ICAP_FAILURE squid-3.4.4.1/errors/nl/ERR_ICAP_FAILURE --- squid-3.4.4/errors/nl/ERR_ICAP_FAILURE 2014-03-09 01:54:13.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    ICAP protocol fout.

    Het systeem gaf als antwoord: %E

    Dit betekent dat een onderdeel van de ICAP communicatie is mislukt.

    Mogelijke problemen zijn:

    • De ICAP server is onbereikbaar.

    • Er is een illegale reactie ontvangen van de ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_INVALID_REQ squid-3.4.4.1/errors/nl/ERR_INVALID_REQ --- squid-3.4.4/errors/nl/ERR_INVALID_REQ 2014-03-09 01:54:13.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    Ongeldige Aanvraag Er is een fout opgetreden tijdens het verwerken van:

    %R

    Mogelijke problemen zijn:

    • Ontbrekende of onbekende verzoekmethode.

    • Ontbrekende URL.

    • Ontbrekende HTTP identificatie (HTTP/1.0).

    • Het verzoek is te lang.

    • De Content-Length ontbreekt voor het POST of PUT verzoek.

    • Er staat een ongeldig teken in de hostnaam; het teken _ is niet toegestaan.

    • HTTP/1.1 Verwacht: feature wordt gevraagd door HTTP/1.0 software.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_INVALID_RESP squid-3.4.4.1/errors/nl/ERR_INVALID_RESP --- squid-3.4.4/errors/nl/ERR_INVALID_RESP 2014-03-09 01:54:16.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    Onverwachte reactie er is een fout opgetreden tijdens het uitvoeren van opdracht:

    %R

    Het ontvangen HTTP bericht is niet begrepen of beschadigd. Neem contact op met de beheerder van de website die u probeert te bereiken.

    De cache beheerder kan u meer informatie verstrekken met betrekking tot de exacte reden van dit probleem.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_INVALID_URL squid-3.4.4.1/errors/nl/ERR_INVALID_URL --- squid-3.4.4/errors/nl/ERR_INVALID_URL 2014-03-09 01:54:16.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Ongeldige URL

    Een gedeelte van de gevraagde URL is ongeldig.

    Mogelijke problemen zijn:

    • Ontbrekend of onjuist toegangsprotocol (moet zijn http:// of vergelijkbaar)

    • Ontbrekende hostnaam

    • Ongeldige dubbele escape in het URL pad

    • Er staat een ongeldig teken in de hostnaam; het teken _ is niet toegestaan.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_LIFETIME_EXP squid-3.4.4.1/errors/nl/ERR_LIFETIME_EXP --- squid-3.4.4/errors/nl/ERR_LIFETIME_EXP 2014-03-09 01:54:17.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    De levensduur van de verbindings is verstreken

    Squid heeft het verzoek afgebroken omdat het de maximale verbindingslevensduur heeft overschreden.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_NO_RELAY squid-3.4.4.1/errors/nl/ERR_NO_RELAY --- squid-3.4.4/errors/nl/ERR_NO_RELAY 2014-03-09 01:54:18.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Geen WAIS Relay

    Er is geen WAIS Relay host gedefinieerd voor deze Cache! Neem contact op met de cachebeheerder.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/nl/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/nl/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:54:18.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Een geldig document werd niet gevonden in de cache, en de only-if-cached richtlijn was ingesteld.

    U heeft een verzoek gedaan met een only-if-cached cachebeheer richtlijn. Het document werd niet gevonden in de cache of er was een herbevestiging nodig die niet werd toegestaan door de only-if-cached richtlijn.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/error-details.txt squid-3.4.4.1/errors/nl/error-details.txt --- squid-3.4.4/errors/nl/error-details.txt 2014-03-09 01:54:25.000000000 -0800 +++ squid-3.4.4.1/errors/nl/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/nl/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/nl/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/nl/ERR_PRECONDITION_FAILED 2014-03-09 01:54:19.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_READ_ERROR squid-3.4.4.1/errors/nl/ERR_READ_ERROR --- squid-3.4.4/errors/nl/ERR_READ_ERROR 2014-03-09 01:54:19.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Leesfout

    Het systeem gaf als antwoord: %E

    Er is een fout opgetreden tijdens het lezen van data van het netwerk. Probeer het opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_READ_TIMEOUT squid-3.4.4.1/errors/nl/ERR_READ_TIMEOUT --- squid-3.4.4/errors/nl/ERR_READ_TIMEOUT 2014-03-09 01:54:20.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Lees Timeout

    Het systeem gaf als antwoord: %E

    Er is een timeout opgetreden tijdens het lezen van data van het netwerk. Het netwerk of de server zijn niet beschikbaar of overbelast. Probeer het opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/nl/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/nl/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:54:20.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Het opzetten van een beveiligde verbinding naar %I is mislukt

    The system returned:

    %E (TLS code: %x)

    %D

    Deze proxy en de benaderde server hebben geen overeenstemming bereikt over de beveiling om uw aanvraag af te handelen. Het is mogelijk dat de benaderde server geen beveiligde verbindingen ondersteund of dat de proxy een te lage beveiliging heeft gedetecteerd.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/nl/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/nl/ERR_SHUTTING_DOWN 2014-03-09 01:54:21.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Deze cache is bezig met herstarten en kan daarom momenteel niet aan uw verzoek voldoen. Probeer het later opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/nl/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/nl/ERR_SOCKET_FAILURE 2014-03-09 01:54:21.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Socket Fout

    Het systeem gaf als antwoord: %E

    Squid is niet in staat een TCP socket aan te maken, waarschijnlijk als gevolg van overbelasting. Probeer uw verzoek opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_TOO_BIG squid-3.4.4.1/errors/nl/ERR_TOO_BIG --- squid-3.4.4/errors/nl/ERR_TOO_BIG 2014-03-09 01:54:22.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    De aanvraag of het antwoord is te groot.

    De POST of PUT opdracht die u heeft verstuurd is te groot.

    Indien u een bestande probeerde te downloaden, dan was het bestand dat U probeert te ontvangen, te groot.

    Deze grootte-beperkingen zijn ingesteld door de beheerder van deze cache. Neem contact op met de beheerder van deze cache, wanneer U van mening bent dat deze beperking onjuist is.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/nl/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/nl/ERR_UNSUP_HTTPVERSION 2014-03-09 01:54:22.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    Niet ondersteunde HTTP versie

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Unsupported HTTP version

    Deze Squid proxy accepteert de HTTP versie die u probeert te gebruiken niet

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_UNSUP_REQ squid-3.4.4.1/errors/nl/ERR_UNSUP_REQ --- squid-3.4.4/errors/nl/ERR_UNSUP_REQ 2014-03-09 01:54:23.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Niet ondersteunde verzoekmethode of protocol

    Squid ondersteunt niet alle verzoekmethoden voor alle toegangsprotocollen. U kunt bijvoorbeeld geen Gopher verzoek POSTen.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_URN_RESOLVE squid-3.4.4.1/errors/nl/ERR_URN_RESOLVE --- squid-3.4.4/errors/nl/ERR_URN_RESOLVE 2014-03-09 01:54:24.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: The requested URN could not be retrieved

    ERROR

    De gevraagde URN kon niet worden benaderd

    De volgende fout is opgetreden tijdens het ophalen van URN: %U

    Kan de URN niet herleiden

    Hmmm, verwacht niet teveel van URNs op %T :)

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_WRITE_ERROR squid-3.4.4.1/errors/nl/ERR_WRITE_ERROR --- squid-3.4.4/errors/nl/ERR_WRITE_ERROR 2014-03-09 01:54:24.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Schrijffout

    Het systeem gaf als antwoord: %E

    Er is een fout opgetreden tijdens het schrijven naar het netwerk. Probeer het opnieuw.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/nl/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/nl/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/nl/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:54:25.000000000 -0800 +++ squid-3.4.4.1/errors/nl/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FOUT: De gevraagde URL kon niet worden opgehaald

    ERROR

    The requested URL could not be retrieved

    De volgende fout is opgetreden tijdens het ophalen van URL: %U

    Antwoord is leeg

    Squid ontving in het geheel geen data op dit verzoek.

    De beheerder van deze cache is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ACCESS_DENIED squid-3.4.4.1/errors/oc/ERR_ACCESS_DENIED --- squid-3.4.4/errors/oc/ERR_ACCESS_DENIED 2014-03-09 01:54:25.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Accès interdich.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:54:26.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/oc/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/oc/ERR_AGENT_CONFIGURE 2014-03-09 01:54:26.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    Per Firefox, anatz a :
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    Per Internet Explorer, anatz a :
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Per Opera, anatz a :
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_AGENT_WPAD squid-3.4.4.1/errors/oc/ERR_AGENT_WPAD --- squid-3.4.4/errors/oc/ERR_AGENT_WPAD 2014-03-09 01:54:27.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    Per Firefox, anatz a :
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    Per Internet Explorer, anatz a :
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    Per Opera, anatz a :
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/oc/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/oc/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:54:27.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Access Denied

    ERROR

    Cache Accès interdich.

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Accès a l'amagatal interdich.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:54:28.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Manager Access Denied

    ERROR

    Cache Manager Accès interdich.

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Cache Manager Access Denied.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/oc/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/oc/ERR_CANNOT_FORWARD 2014-03-09 01:54:28.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Problèmas envisajables :

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_CONFLICT_HOST squid-3.4.4.1/errors/oc/ERR_CONFLICT_HOST --- squid-3.4.4/errors/oc/ERR_CONFLICT_HOST 2014-03-09 01:54:29.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Problèmas envisajables :

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_CONNECT_FAIL squid-3.4.4.1/errors/oc/ERR_CONNECT_FAIL --- squid-3.4.4/errors/oc/ERR_CONNECT_FAIL 2014-03-09 01:54:29.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    La connexion a %I a fracassat.

    Lo sistèma a tornat : %E

    The remote host or network may be down. Please try the request again.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_DIR_LISTING squid-3.4.4.1/errors/oc/ERR_DIR_LISTING --- squid-3.4.4/errors/oc/ERR_DIR_LISTING 2014-03-09 01:54:30.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Repertòri : %U

    Repertòri : %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_DNS_FAIL squid-3.4.4.1/errors/oc/ERR_DNS_FAIL --- squid-3.4.4/errors/oc/ERR_DNS_FAIL 2014-03-09 01:54:31.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Impossible d'associar una adreça IP a la maquina %H

    Lo servidor DNS a tornat :

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ESI squid-3.4.4.1/errors/oc/ERR_ESI --- squid-3.4.4/errors/oc/ERR_ESI 2014-03-09 01:54:31.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Lo tractament ESI a fracassat.

    Lo processor ESI a respondut :

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Vòstre webmèstre es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/oc/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/oc/ERR_FORWARDING_DENIED 2014-03-09 01:54:32.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Forwarding Denied.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_DISABLED squid-3.4.4.1/errors/oc/ERR_FTP_DISABLED --- squid-3.4.4/errors/oc/ERR_FTP_DISABLED 2014-03-09 01:54:32.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Lo FTP es desactivat

    This cache does not support FTP.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_FAILURE squid-3.4.4.1/errors/oc/ERR_FTP_FAILURE --- squid-3.4.4/errors/oc/ERR_FTP_FAILURE 2014-03-09 01:54:33.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    Lo servidor a respondut :

    %F
    %g

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/oc/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/oc/ERR_FTP_FORBIDDEN 2014-03-09 01:54:33.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    Lo servidor a respondut :

    %F
    %g

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/oc/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/oc/ERR_FTP_NOT_FOUND 2014-03-09 01:54:34.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    The following URL could not be retrieved: %U

    Squid sent the following FTP command:

    %f

    Lo servidor a respondut :

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/oc/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/oc/ERR_FTP_PUT_CREATED 2014-03-09 01:54:34.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Ooperacion capitada

    Fichièr creat


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/oc/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/oc/ERR_FTP_PUT_ERROR 2014-03-09 01:54:35.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: FTP upload failed

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    Lo servidor a respondut :

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/oc/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/oc/ERR_FTP_PUT_MODIFIED 2014-03-09 01:54:35.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Ooperacion capitada

    Fichièr mes a jorn


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/oc/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/oc/ERR_FTP_UNAVAILABLE 2014-03-09 01:54:36.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    The FTP server was too busy to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    Lo servidor a respondut :

    %F
    %g

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/oc/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/oc/ERR_GATEWAY_FAILURE 2014-03-09 01:54:36.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ICAP_FAILURE squid-3.4.4.1/errors/oc/ERR_ICAP_FAILURE --- squid-3.4.4/errors/oc/ERR_ICAP_FAILURE 2014-03-09 01:54:37.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Error de protocòl ICAP.

    Lo sistèma a tornat : %E

    This means that some aspect of the ICAP communication failed.

    Problèmas envisajables :

    • Lo servidor ICAP es pas jonhible.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_INVALID_REQ squid-3.4.4.1/errors/oc/ERR_INVALID_REQ --- squid-3.4.4/errors/oc/ERR_INVALID_REQ 2014-03-09 01:54:37.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    Invalid Request error was encountered while trying to process the request:

    %R

    Problèmas envisajables :

    • Metòde de requèsta desconegut o perdut.

    • Abséncia d'URL

    • Abséncia d'identificant HTTP (HTTP/1.0)

    • Request is too large.

    • Content-Length missing for POST or PUT requests.

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_INVALID_RESP squid-3.4.4.1/errors/oc/ERR_INVALID_RESP --- squid-3.4.4/errors/oc/ERR_INVALID_RESP 2014-03-09 01:54:38.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_INVALID_URL squid-3.4.4.1/errors/oc/ERR_INVALID_URL --- squid-3.4.4/errors/oc/ERR_INVALID_URL 2014-03-09 01:54:39.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    URL invalida

    Some aspect of the requested URL is incorrect.

    Problèmas envisajables :

    • Missing or incorrect access protocol (should be http:// or similar)

    • Nom de maquina absent

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_LIFETIME_EXP squid-3.4.4.1/errors/oc/ERR_LIFETIME_EXP --- squid-3.4.4/errors/oc/ERR_LIFETIME_EXP 2014-03-09 01:54:39.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Durada de vida de la connexion depassada

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_NO_RELAY squid-3.4.4.1/errors/oc/ERR_NO_RELAY --- squid-3.4.4/errors/oc/ERR_NO_RELAY 2014-03-09 01:54:40.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/oc/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/oc/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:54:40.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/error-details.txt squid-3.4.4.1/errors/oc/error-details.txt --- squid-3.4.4/errors/oc/error-details.txt 2014-03-09 01:54:47.000000000 -0800 +++ squid-3.4.4.1/errors/oc/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/oc/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/oc/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/oc/ERR_PRECONDITION_FAILED 2014-03-09 01:54:41.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_READ_ERROR squid-3.4.4.1/errors/oc/ERR_READ_ERROR --- squid-3.4.4/errors/oc/ERR_READ_ERROR 2014-03-09 01:54:41.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Error de lectura

    Lo sistèma a tornat : %E

    An error condition occurred while reading data from the network. Please retry your request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_READ_TIMEOUT squid-3.4.4.1/errors/oc/ERR_READ_TIMEOUT --- squid-3.4.4/errors/oc/ERR_READ_TIMEOUT 2014-03-09 01:54:42.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Read Timeout

    Lo sistèma a tornat : %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/oc/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/oc/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:54:42.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/oc/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/oc/ERR_SHUTTING_DOWN 2014-03-09 01:54:43.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/oc/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/oc/ERR_SOCKET_FAILURE 2014-03-09 01:54:43.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Error de socket

    Lo sistèma a tornat : %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_TOO_BIG squid-3.4.4.1/errors/oc/ERR_TOO_BIG --- squid-3.4.4/errors/oc/ERR_TOO_BIG 2014-03-09 01:54:44.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    La requèsta o la responsa es tròp gròssa.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/oc/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/oc/ERR_UNSUP_HTTPVERSION 2014-03-09 01:54:44.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    Version de HTTP pas suportada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_UNSUP_REQ squid-3.4.4.1/errors/oc/ERR_UNSUP_REQ --- squid-3.4.4/errors/oc/ERR_UNSUP_REQ 2014-03-09 01:54:45.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Unsupported Request Method and Protocol

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_URN_RESOLVE squid-3.4.4.1/errors/oc/ERR_URN_RESOLVE --- squid-3.4.4/errors/oc/ERR_URN_RESOLVE 2014-03-09 01:54:45.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    The following error was encountered while trying to retrieve the URN: %U

    Impossible de resòlvre l'URN

    Hey, don't expect too much from URNs on %T :)

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_WRITE_ERROR squid-3.4.4.1/errors/oc/ERR_WRITE_ERROR --- squid-3.4.4/errors/oc/ERR_WRITE_ERROR 2014-03-09 01:54:46.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Problèma d'escritura

    Lo sistèma a tornat : %E

    An error condition occurred while writing to the network. Please retry your request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/oc/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/oc/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/oc/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:54:47.000000000 -0800 +++ squid-3.4.4.1/errors/oc/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERREUR : L'URL demandada a pas pogut èsser cargada

    ERROR

    L'URL demandada a pas pogut èsser cargada

    L'error seguenta s'es producha en ensajant d'accedir a l'URL : %U

    Responsa de talha nulla

    Squid did not receive any data for this request.

    Vòstre administrator d'amagatal es %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ACCESS_DENIED squid-3.4.4.1/errors/pl/ERR_ACCESS_DENIED --- squid-3.4.4/errors/pl/ERR_ACCESS_DENIED 2014-03-09 01:54:47.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Dostęp zabroniony.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:54:48.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/pl/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/pl/ERR_AGENT_CONFIGURE 2014-03-09 01:54:48.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    BŁĄD

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_AGENT_WPAD squid-3.4.4.1/errors/pl/ERR_AGENT_WPAD --- squid-3.4.4/errors/pl/ERR_AGENT_WPAD 2014-03-09 01:54:49.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    BŁĄD

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/pl/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/pl/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:54:49.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Cache Access Denied

    ERROR

    Cache Dostęp zabroniony.

    The following error was encountered while trying to retrieve the URL: %U

    Dostęp do serwera cache zabroniony.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:54:50.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Cache Manager Access Denied

    ERROR

    Cache Manager Dostęp zabroniony.

    The following error was encountered while trying to retrieve the URL: %U

    Dostep do cache managera zabroniony.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Skontaktuj się z administratorem serwera cache jeśli masz trudności z autoryzacją, jeśli jesteś administratorem, przeczytaj w dokumentacji Squida fragment dotyczący cache managera i sprawdź log serwera cache w poszukiwaniu bardziej szczegółowych komunikatów o błędach.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/pl/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/pl/ERR_CANNOT_FORWARD 2014-03-09 01:54:51.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nie można przekazać tego żądania w chwili obecnej.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_CONFLICT_HOST squid-3.4.4.1/errors/pl/ERR_CONFLICT_HOST --- squid-3.4.4/errors/pl/ERR_CONFLICT_HOST 2014-03-09 01:54:51.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_CONNECT_FAIL squid-3.4.4.1/errors/pl/ERR_CONNECT_FAIL --- squid-3.4.4/errors/pl/ERR_CONNECT_FAIL 2014-03-09 01:54:52.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nieudane połączenie z %I.

    System zwrócił wartość: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_DIR_LISTING squid-3.4.4.1/errors/pl/ERR_DIR_LISTING --- squid-3.4.4/errors/pl/ERR_DIR_LISTING 2014-03-09 01:54:52.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Katalog: %U

    Katalog: %U/

    Zawartość katalogu:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_DNS_FAIL squid-3.4.4.1/errors/pl/ERR_DNS_FAIL --- squid-3.4.4/errors/pl/ERR_DNS_FAIL 2014-03-09 01:54:53.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nie można ustalić adresu IP hosta o nazwie %H

    Serwer DNS zwrócił następującą wartość:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ESI squid-3.4.4.1/errors/pl/ERR_ESI --- squid-3.4.4/errors/pl/ERR_ESI 2014-03-09 01:54:53.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/pl/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/pl/ERR_FORWARDING_DENIED 2014-03-09 01:54:54.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Przekazanie żądania zabronione.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_DISABLED squid-3.4.4.1/errors/pl/ERR_FTP_DISABLED --- squid-3.4.4/errors/pl/ERR_FTP_DISABLED 2014-03-09 01:54:55.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP jest wyłączone

    Ten serwer cache nie prowadzi połączeń FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_FAILURE squid-3.4.4.1/errors/pl/ERR_FTP_FAILURE --- squid-3.4.4/errors/pl/ERR_FTP_FAILURE 2014-03-09 01:54:55.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    Wystąpił błąd protokołu FTP podczas sprowadznia URL-a: %U

    Squid wysłał następującą komendę FTP:

    %f

    Odpowiedź serwera:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/pl/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/pl/ERR_FTP_FORBIDDEN 2014-03-09 01:54:56.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid wysłał następującą komendę FTP:

    %f

    Odpowiedź serwera:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/pl/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/pl/ERR_FTP_NOT_FOUND 2014-03-09 01:54:56.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid wysłał następującą komendę FTP:

    %f

    Odpowiedź serwera:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/pl/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/pl/ERR_FTP_PUT_CREATED 2014-03-09 01:54:57.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacja zakończona pomyślnie

    plik został utworzony


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/pl/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/pl/ERR_FTP_PUT_ERROR 2014-03-09 01:54:57.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: FTP upload failed

    ERROR

    FTP PUT upload failed

    Wystąpił błąd protokołu FTP podczas sprowadznia URL-a: %U

    Squid wysłał następującą komendę FTP:

    %f

    Odpowiedź serwera:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/pl/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/pl/ERR_FTP_PUT_MODIFIED 2014-03-09 01:54:58.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacja zakończona pomyślnie

    plik uaktualniony


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/pl/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/pl/ERR_FTP_UNAVAILABLE 2014-03-09 01:54:59.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid wysłał następującą komendę FTP:

    %f

    Odpowiedź serwera:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/pl/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/pl/ERR_GATEWAY_FAILURE 2014-03-09 01:54:59.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ICAP_FAILURE squid-3.4.4.1/errors/pl/ERR_ICAP_FAILURE --- squid-3.4.4/errors/pl/ERR_ICAP_FAILURE 2014-03-09 01:55:00.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    System zwrócił wartość: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • Serwer ICAP jest nieosiągalny.

    • Odebrano błędną odpowiedź z serwera ICAP


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_INVALID_REQ squid-3.4.4.1/errors/pl/ERR_INVALID_REQ --- squid-3.4.4/errors/pl/ERR_INVALID_REQ 2014-03-09 01:55:00.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    Nieprawidłowe zapytanie wystąpił błąd podczas próby przetworzenia zapytania

    %R

    Some possible problems are:

    • Brak lub nieznana metoda (GET, POST)

    • Brak URL-a

    • Brak identyfikatora HTTP (HTTP/1.0)

    • RZbyt duży rozmiar żądania

    • Brak pola Content-Length dla metod POST lub PUT

    • Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_INVALID_RESP squid-3.4.4.1/errors/pl/ERR_INVALID_RESP --- squid-3.4.4/errors/pl/ERR_INVALID_RESP 2014-03-09 01:55:01.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    Nieprawidłowa odpowiedź wystąpił błąd podczas próby przetworzenia zapytania

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_INVALID_URL squid-3.4.4.1/errors/pl/ERR_INVALID_URL --- squid-3.4.4/errors/pl/ERR_INVALID_URL 2014-03-09 01:55:02.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    błędny URL

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Brak lub niewłaściwy protokół (should be http:// or similar)

    • Brak nazwy hosta

    • podwójna sekwencja escape w ścieżce URL

    • Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_LIFETIME_EXP squid-3.4.4.1/errors/pl/ERR_LIFETIME_EXP --- squid-3.4.4/errors/pl/ERR_LIFETIME_EXP 2014-03-09 01:55:03.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    przekroczony dopuszczalny czas połączenie

    Squid zakończył realizację żądania, ponieważ czas jego realizacji przekroczył dopuszczalny limit.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_NO_RELAY squid-3.4.4.1/errors/pl/ERR_NO_RELAY --- squid-3.4.4/errors/pl/ERR_NO_RELAY 2014-03-09 01:55:04.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    brak Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/pl/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/pl/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:55:05.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    żądanie z dyrektywą only-if-cached dotyczyło dokumentu aktualnie nie przechowywanego przez sewer cache.

    Żądanie zawierało dyrektywę only-if-cached. Dokument nie został znaleziony w zasobech serwera cache lub wymagał odświeżenia zabronionego dyrektywą only-if-cached.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/error-details.txt squid-3.4.4.1/errors/pl/error-details.txt --- squid-3.4.4/errors/pl/error-details.txt 2014-03-09 01:55:11.000000000 -0800 +++ squid-3.4.4.1/errors/pl/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/pl/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/pl/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/pl/ERR_PRECONDITION_FAILED 2014-03-09 01:55:05.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_READ_ERROR squid-3.4.4.1/errors/pl/ERR_READ_ERROR --- squid-3.4.4/errors/pl/ERR_READ_ERROR 2014-03-09 01:55:06.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    błąd odczytu

    System zwrócił wartość: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_READ_TIMEOUT squid-3.4.4.1/errors/pl/ERR_READ_TIMEOUT --- squid-3.4.4/errors/pl/ERR_READ_TIMEOUT 2014-03-09 01:55:06.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    przekroczony czas odczytu

    System zwrócił wartość: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/pl/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/pl/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:55:07.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Nie można ustanowić bezpiecznego połączenia z %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/pl/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/pl/ERR_SHUTTING_DOWN 2014-03-09 01:55:08.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/pl/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/pl/ERR_SOCKET_FAILURE 2014-03-09 01:55:08.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Socket Failure

    System zwrócił wartość: %E

    Squid nie jest w stanie otworzyć gniazdka TCP (TCP socket), prawdopodobnie z powodu przeciążenia systemu. Proszę ponowić żądanie.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_TOO_BIG squid-3.4.4.1/errors/pl/ERR_TOO_BIG --- squid-3.4.4/errors/pl/ERR_TOO_BIG 2014-03-09 01:55:09.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zapytanie lub odpowiedź jest zbyt długa.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/pl/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/pl/ERR_UNSUP_HTTPVERSION 2014-03-09 01:55:09.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    Nieobsługiwana wersja HTTP

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_UNSUP_REQ squid-3.4.4.1/errors/pl/ERR_UNSUP_REQ --- squid-3.4.4/errors/pl/ERR_UNSUP_REQ 2014-03-09 01:55:10.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    użyta w żądaniu kombinacja metoda/protokół jest niewłaściwa

    Squid nie wspiera wszystkich metod we wszystkich protokołach. Na przykład nie możesz użyć metody POST w żądaniu skierowanym do usługi Gopher.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_URN_RESOLVE squid-3.4.4.1/errors/pl/ERR_URN_RESOLVE --- squid-3.4.4/errors/pl/ERR_URN_RESOLVE 2014-03-09 01:55:10.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: The requested URN could not be retrieved

    ERROR

    URL dla żądanego URN nie może zostać sprowadzony

    The following error was encountered while trying to retrieve the URN: %U

    nie można zlokalizować URN

    Proszę nie spodziewać się zbyt wiele od URNów z %T :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_WRITE_ERROR squid-3.4.4.1/errors/pl/ERR_WRITE_ERROR --- squid-3.4.4/errors/pl/ERR_WRITE_ERROR 2014-03-09 01:55:11.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    błąd zapisu

    System zwrócił wartość: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pl/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/pl/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/pl/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:55:11.000000000 -0800 +++ squid-3.4.4.1/errors/pl/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - BŁĄD: Żądany URL nie może zostać pobrany

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    sprowadzony dokument ma zerowy rozmiar

    Squid nie otrzymał żadnych danych w odpowiedzi na to żądanie.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ACCESS_DENIED squid-3.4.4.1/errors/pt/ERR_ACCESS_DENIED --- squid-3.4.4/errors/pt/ERR_ACCESS_DENIED 2014-03-09 01:55:36.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Proibido o Acesso.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:55:36.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/pt/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/pt/ERR_AGENT_CONFIGURE 2014-03-09 01:55:37.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERRO

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_AGENT_WPAD squid-3.4.4.1/errors/pt/ERR_AGENT_WPAD --- squid-3.4.4/errors/pt/ERR_AGENT_WPAD 2014-03-09 01:55:37.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERRO

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/pt/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/pt/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:55:38.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: Cache Access Denied

    ERROR

    Cache Proibido o Acesso.

    The following error was encountered while trying to retrieve the URL: %U

    Proibido o acesso ao Cache.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:55:39.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: Cache Manager Access Denied

    ERROR

    Cache Manager Proibido o Acesso.

    The following error was encountered while trying to retrieve the URL: %U

    Proibido o acesso ao Gerenciador do Cache.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Por favor contate o administrador do cache se você tiver dificuldades para se autenticar ou, se você é o administrador, leia a documentação do Squid no próprio gerenciador de cache e verifique o log para mensagens de erros mais detalhadas.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/pt/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/pt/ERR_CANNOT_FORWARD 2014-03-09 01:55:39.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Cache incapaz de encaminhar esta requisição neste momento.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_CONFLICT_HOST squid-3.4.4.1/errors/pt/ERR_CONFLICT_HOST --- squid-3.4.4/errors/pt/ERR_CONFLICT_HOST 2014-03-09 01:55:40.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_CONNECT_FAIL squid-3.4.4.1/errors/pt/ERR_CONNECT_FAIL --- squid-3.4.4/errors/pt/ERR_CONNECT_FAIL 2014-03-09 01:55:40.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    O sistema retornou: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_DIR_LISTING squid-3.4.4.1/errors/pt/ERR_DIR_LISTING --- squid-3.4.4/errors/pt/ERR_DIR_LISTING 2014-03-09 01:55:41.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_DNS_FAIL squid-3.4.4.1/errors/pt/ERR_DNS_FAIL --- squid-3.4.4/errors/pt/ERR_DNS_FAIL 2014-03-09 01:55:42.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Incapaz de determinar o endereço IP através do nome do host %H

    O servidor DNS retornou:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ESI squid-3.4.4.1/errors/pt/ERR_ESI --- squid-3.4.4/errors/pt/ERR_ESI 2014-03-09 01:55:42.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/pt/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/pt/ERR_FORWARDING_DENIED 2014-03-09 01:55:43.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Expedição proibida.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_DISABLED squid-3.4.4.1/errors/pt/ERR_FTP_DISABLED --- squid-3.4.4/errors/pt/ERR_FTP_DISABLED 2014-03-09 01:55:44.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP desabilitado

    Este cache não está habilitado para FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_FAILURE squid-3.4.4.1/errors/pt/ERR_FTP_FAILURE --- squid-3.4.4/errors/pt/ERR_FTP_FAILURE 2014-03-09 01:55:45.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    Ocorreu erro no protocolo FTP Na tentativa de recuperar a URL:%U

    Squid emitiu o seguinte comando FTP:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/pt/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/pt/ERR_FTP_FORBIDDEN 2014-03-09 01:55:45.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    Ocorreu uma falha na autenticação no FTP, na tentativa de recuperar a seguinte URL:%U

    Squid emitiu o seguinte comando FTP:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/pt/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/pt/ERR_FTP_NOT_FOUND 2014-03-09 01:55:46.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    A seguite URL não pode ser recuperada (não foi encontrada): %U

    Squid emitiu o seguinte comando FTP:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/pt/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/pt/ERR_FTP_PUT_CREATED 2014-03-09 01:55:47.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Sucesso na execução

    File created


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/pt/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/pt/ERR_FTP_PUT_ERROR 2014-03-09 01:55:47.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: FTP upload failed

    ERROR

    FTP PUT upload failed

    Ocorreu erro no protocolo FTP Na tentativa de recuperar a URL:%U

    Squid emitiu o seguinte comando FTP:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/pt/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/pt/ERR_FTP_PUT_MODIFIED 2014-03-09 01:55:48.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Sucesso na execução

    File updated


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/pt/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/pt/ERR_FTP_UNAVAILABLE 2014-03-09 01:55:49.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid emitiu o seguinte comando FTP:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/pt/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/pt/ERR_GATEWAY_FAILURE 2014-03-09 01:55:50.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ICAP_FAILURE squid-3.4.4.1/errors/pt/ERR_ICAP_FAILURE --- squid-3.4.4/errors/pt/ERR_ICAP_FAILURE 2014-03-09 01:55:50.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    O sistema retornou: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_INVALID_REQ squid-3.4.4.1/errors/pt/ERR_INVALID_REQ --- squid-3.4.4/errors/pt/ERR_INVALID_REQ 2014-03-09 01:55:51.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Método desconhecido ou faltando (GET, POST)

    • Faltou a URL

    • Faltou o identificador HTTP (HTTP/1.0)

    • A requisição pode ser muito grande

    • Content-Length missing for POST or PUT requests.

    • Hostname com caracter inválido; não são permitidos underscores.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_INVALID_RESP squid-3.4.4.1/errors/pt/ERR_INVALID_RESP --- squid-3.4.4/errors/pt/ERR_INVALID_RESP 2014-03-09 01:55:52.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_INVALID_URL squid-3.4.4.1/errors/pt/ERR_INVALID_URL --- squid-3.4.4/errors/pt/ERR_INVALID_URL 2014-03-09 01:55:53.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URL inválida

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Protocolo de acesso incorreto ou faltando (deve ser http:// ou similar)

    • Faltou o hostname

    • Illegal double-escape in the URL-Path

    • Hostname com caracter inválido; não são permitidos underscores.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_LIFETIME_EXP squid-3.4.4.1/errors/pt/ERR_LIFETIME_EXP --- squid-3.4.4/errors/pt/ERR_LIFETIME_EXP 2014-03-09 01:55:53.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    O tempo limite de conexão expirou

    Squid terminou a requisição porque excedeu o tempo máximo permitido.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_NO_RELAY squid-3.4.4.1/errors/pt/ERR_NO_RELAY --- squid-3.4.4/errors/pt/ERR_NO_RELAY 2014-03-09 01:55:54.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/pt/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/pt/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:55:55.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Não foi encontrado documento válido no cache e a opção only-if-cached foi especificada.

    Você requisitou com a diretiva de controle do cache only-if-cached ativa. O documento não foi encontrado no cache, ou requer revalidação proibida pela opção only-if-cached

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/error-details.txt squid-3.4.4.1/errors/pt/error-details.txt --- squid-3.4.4/errors/pt/error-details.txt 2014-03-09 01:56:02.000000000 -0800 +++ squid-3.4.4.1/errors/pt/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/pt/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/pt/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/pt/ERR_PRECONDITION_FAILED 2014-03-09 01:55:55.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_READ_ERROR squid-3.4.4.1/errors/pt/ERR_READ_ERROR --- squid-3.4.4/errors/pt/ERR_READ_ERROR 2014-03-09 01:55:56.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Erro de leitura

    O sistema retornou: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_READ_TIMEOUT squid-3.4.4.1/errors/pt/ERR_READ_TIMEOUT --- squid-3.4.4/errors/pt/ERR_READ_TIMEOUT 2014-03-09 01:55:57.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Excedeu o tempo limite para leitura (timeout)

    O sistema retornou: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/pt/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/pt/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:55:57.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/pt/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/pt/ERR_SHUTTING_DOWN 2014-03-09 01:55:58.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/pt/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/pt/ERR_SOCKET_FAILURE 2014-03-09 01:55:58.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Falha no Socket

    O sistema retornou: %E

    Squid foi incapaz de criar um socket TCP, talvez por excesso de carga no sistema. Por favor tente novamente.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_TOO_BIG squid-3.4.4.1/errors/pt/ERR_TOO_BIG --- squid-3.4.4/errors/pt/ERR_TOO_BIG 2014-03-09 01:55:59.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    A requisição ou resposta é muito grande.

    Se você estiver fazendo uma requisição POST ou PUT, então o corpo de sua requisição (o que você está tentando enviar) é muito grande.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/pt/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/pt/ERR_UNSUP_HTTPVERSION 2014-03-09 01:55:59.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_UNSUP_REQ squid-3.4.4.1/errors/pt/ERR_UNSUP_REQ --- squid-3.4.4/errors/pt/ERR_UNSUP_REQ 2014-03-09 01:56:00.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Método ou protocolo não suportado.

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_URN_RESOLVE squid-3.4.4.1/errors/pt/ERR_URN_RESOLVE --- squid-3.4.4/errors/pt/ERR_URN_RESOLVE 2014-03-09 01:56:01.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: The requested URN could not be retrieved

    ERROR

    Uma URL para requisição URN não pode ser recuperada

    The following error was encountered while trying to retrieve the URN: %U

    Não pode resolver a URN

    Não espere muita coisa de URNS em %T :-)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_WRITE_ERROR squid-3.4.4.1/errors/pt/ERR_WRITE_ERROR --- squid-3.4.4/errors/pt/ERR_WRITE_ERROR 2014-03-09 01:56:01.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Erro de gravação

    O sistema retornou: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/pt/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/pt/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:56:02.000000000 -0800 +++ squid-3.4.4.1/errors/pt/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL solicitada não pode ser recuperada

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Resposta com tamanho zero

    Squid não recebeu nenhum dado para esta requisição.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ACCESS_DENIED squid-3.4.4.1/errors/pt-br/ERR_ACCESS_DENIED --- squid-3.4.4/errors/pt-br/ERR_ACCESS_DENIED 2014-03-09 01:55:12.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Acesso negado.

    A configuração do controle de acesso impede que sua requisição seja permitida neste momento. Por favor, contate seu provedor de serviço se você acha que isso está incorreto.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:55:13.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Quota de tempo Excedida.

    Este proxy limita seu tempo conectado com uma cota. Sua cota de tempo está vazia agora mas será recarregada quando o período de tempo configurado recomeçar.

    Esses limites foram estabelecidos pelo Provedor de Serviço Internet que opera este cache. Por favor, contate-os diretamente se você acha que isso é um erro.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/pt-br/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/pt-br/ERR_AGENT_CONFIGURE 2014-03-09 01:55:13.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuração do Navegador Web

    ERRO

    Web Browser Configuration

    A configuração de seu navegador precisa ser corrigida para usar esta rede.

    Como encontrar estas configurações no seu navegador:

    Para navegadores Firefox vá para:
    • Ferramentas -> Opções -> Avançado -> Rede -> Configurações da Conexão
    • Na caixa HTTP proxy digite o nome do proxy %h e porta %b.
    Para navegadores Internet Expĺorer vá para:
    • Ferramentas -> Opções de Internet -> Conexão -> Configurações da LAN ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Para navegadores Opera vá para:
    • Ferramentas -> Preferências -> Avançado -> Rede -> Servidores Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_AGENT_WPAD squid-3.4.4.1/errors/pt-br/ERR_AGENT_WPAD --- squid-3.4.4/errors/pt-br/ERR_AGENT_WPAD 2014-03-09 01:55:14.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configuração do Navegador Web

    ERRO

    Web Browser Configuration

    A configuração de seu navegador precisa ser corrigida para usar esta rede.

    Como encontrar estas configurações no seu navegador:

    Para navegadores Firefox vá para:
    • Ferramentas -> Opções -> Avançado -> Rede -> Configurações da Conexão
    • Selecionar configurações de auto-detecção de proxy para esta rede
    Para navegadores Internet Expĺorer vá para:
    • Ferramentas -> Opções de Internet -> Conexão -> Configurações da LAN ->Proxy
    • Selecione Detectar configurações automaticamente
    Para navegadores Opera vá para:
    • Ferramentas -> Preferências -> Avançado -> Rede -> Servidores Proxy
    • Selecione Usar configuração automática de proxy

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/pt-br/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/pt-br/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:55:14.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: Cache Access Denied

    ERROR

    Cache Acesso negado.

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Acesso negado ao cache.

    Desculpe. Atualmente, você não tem permissáo para requisitar %U deste cache até que você tenha se autenticado.

    Por favor, contate o administrador do cache se você está tendo dificuldades em se autenticar ou mude sua senha.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:55:15.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: Cache Manager Access Denied

    ERROR

    Cache Manager Acesso negado.

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Acesso negado ao gerenciador de cache.

    Desculpe. Atualmente, você não tem permissão para requisitar %U deste gerenciador de cache até que você tenha se autenticado.

    Por favor, contate o administrador do cache se você está tendo dificuldades em se autenticar ou, se você é o administrador, leia a documentação do Squid na interface de gerenciamento de cache e cheque o log para maiores detalhes sobre mensagens de erro.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/pt-br/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/pt-br/ERR_CANNOT_FORWARD 2014-03-09 01:55:15.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Impossível encaminhar esta requisição nesse momento.

    Esta requisição não pode ser repassada para o servidor de origem ou para qualquer cache pai.

    Alguns dos possíveis problemas são:

    • Uma conexão à Internet necessária para acessar estes servidores de origem de domínios parece estar fora.
    • Todos os caches-pais configurados parecem estar fora de alcance no momento.
    • O administrador pode não ter permitido que este cache fizesse conexoes diretas a servidores de origem.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_CONFLICT_HOST squid-3.4.4.1/errors/pt-br/ERR_CONFLICT_HOST --- squid-3.4.4/errors/pt-br/ERR_CONFLICT_HOST 2014-03-09 01:55:16.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Conflito de máquina de URI

    Isto significa que o nome de domínio que você está tentando acessar aparentemente não existe mais na máquina onde você está requisitando.

    Alguns dos possíveis problemas são:

    • O domínio pode ter se movido muito recentemente. Tentar de novo pode resolver isto.
    • O website pode exigir que você use uma versão baseada no país local. Usar o(s) servidore(s) DNS fornecido(s) por seu provedor pode resolver isto.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_CONNECT_FAIL squid-3.4.4.1/errors/pt-br/ERR_CONNECT_FAIL --- squid-3.4.4/errors/pt-br/ERR_CONNECT_FAIL 2014-03-09 01:55:17.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Conexão para %I falhou.

    O sistema retornou: %E

    O host ou rede remota pode estar fora do ar. Por favor, faça a requisição novamente.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_DIR_LISTING squid-3.4.4.1/errors/pt-br/ERR_DIR_LISTING --- squid-3.4.4/errors/pt-br/ERR_DIR_LISTING 2014-03-09 01:55:17.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Diretório: %U

    Diretório: %U/

    Conteúdo do diretório:

    %z
    %g
    Diretório pai (Diretório raiz)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_DNS_FAIL squid-3.4.4.1/errors/pt-br/ERR_DNS_FAIL --- squid-3.4.4/errors/pt-br/ERR_DNS_FAIL 2014-03-09 01:55:18.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Impossível determinar o endereço IP do nome de host %H

    O servidor DNS retornou:

    %z

    Isto significa que o cache não pode resolver o nome de host contido na URL. Verifique se o endereço está correto.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ESI squid-3.4.4.1/errors/pt-br/ERR_ESI --- squid-3.4.4/errors/pt-br/ERR_ESI 2014-03-09 01:55:18.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    O processamento de ESI falhou.

    O processador ESI retornou:

    %Z

    Isto significa que o surrogate não pode processar o modelo do ESI. Por favor, informe este erro ao webmaster.

    Seu webmaster é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/pt-br/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/pt-br/ERR_FORWARDING_DENIED 2014-03-09 01:55:19.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Encaminhamento Negado.

    Este cache não encaminhará sua requisição porque está tentando forçar um relacionamento. Talvez o cliente em %i é um cache que está mal configurado.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_DISABLED squid-3.4.4.1/errors/pt-br/ERR_FTP_DISABLED --- squid-3.4.4/errors/pt-br/ERR_FTP_DISABLED 2014-03-09 01:55:19.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    FTP está Desabilitado

    Esse cache não suporta FTP.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_FAILURE squid-3.4.4.1/errors/pt-br/ERR_FTP_FAILURE --- squid-3.4.4/errors/pt-br/ERR_FTP_FAILURE 2014-03-09 01:55:20.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    Um erro no protocolo FTP ocorreu ao tentar recuperar a URL: %U

    Squid enviou o seguinte comando FTP:

    %f

    O servidor respondeu com:

    %F
    %g

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/pt-br/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/pt-br/ERR_FTP_FORBIDDEN 2014-03-09 01:55:20.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    Ocorreu uma falha na autenticação do FTP ao tentar recuperar a URL: %U

    Squid enviou o seguinte comando FTP:

    %f

    O servidor respondeu com:

    %F
    %g

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/pt-br/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/pt-br/ERR_FTP_NOT_FOUND 2014-03-09 01:55:21.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    A seguinte URL não pôde ser recuperada: %U

    Squid enviou o seguinte comando FTP:

    %f

    O servidor respondeu com:

    %F
    %g

    Isto pode ser causa de uma URL de FTP com um caminho absoluto (que não é conforme com a RFC 1738). Se esta for a causa, então o arquivo pode ser encontrado em %B.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/pt-br/ERR_FTP_PUT_CREATED 2014-03-09 01:55:22.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - PUT FTP bem sucedido.

    Operação bem sucedida

    Arquivo criado


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/pt-br/ERR_FTP_PUT_ERROR 2014-03-09 01:55:22.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: FTP upload failed

    ERROR

    Upload de FTP PUT falhou

    Um erro no protocolo FTP ocorreu ao tentar recuperar a URL: %U

    Squid enviou o seguinte comando FTP:

    %f

    O servidor respondeu com:

    %F

    Isto significa que o servidor FTP não tem permissão ou espaço suficiente para armazenar o arquivo. Verifique o caminho, permissão, espaço em disco e tente novamente.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/pt-br/ERR_FTP_PUT_MODIFIED 2014-03-09 01:55:23.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - PUT FTP bem sucedido.

    Operação bem sucedida

    Arquivo atualizado


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/pt-br/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/pt-br/ERR_FTP_UNAVAILABLE 2014-03-09 01:55:24.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O servidor FTP estava muito ocupado para recuperar a URL: %U

    Squid enviou o seguinte comando FTP:

    %f

    O servidor respondeu com:

    %F
    %g

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/pt-br/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/pt-br/ERR_GATEWAY_FAILURE 2014-03-09 01:55:24.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Falha de Gateway Proxy

    Uma falha interna ou problema de configuração irrecuperáveis impedem que esta requisição seja completada.

    Isto pode ser devido aos limites estabelecidos pelo provedor de internet que opera este cache. Por favor contate-os para mais informações.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ICAP_FAILURE squid-3.4.4.1/errors/pt-br/ERR_ICAP_FAILURE --- squid-3.4.4/errors/pt-br/ERR_ICAP_FAILURE 2014-03-09 01:55:25.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Erro de protocolo ICAP.

    O sistema retornou: %E

    Isto significa que alguma característica da comunicação ICAP falhou.

    Alguns dos possíveis problemas são:

    • O servidor ICAP não é alcançável.

    • Uma resposta ilegal foi recebida do servidor ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_INVALID_REQ squid-3.4.4.1/errors/pt-br/ERR_INVALID_REQ --- squid-3.4.4/errors/pt-br/ERR_INVALID_REQ 2014-03-09 01:55:26.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    Requisição Inválida erro encontrado ao tentar processar a requisição:

    %R

    Alguns dos possíveis problemas são:

    • Método de requisição faltando ou desconhecido.

    • URL faltando.

    • Identificador HTTP faltando (HTTP/1.0).

    • Requisição é muito grande.

    • Content-Length faltando para requisições POST ou PUT.

    • Caracter ilegal no nome de host; underscores não são permitidos.

    • HTTP/1.1 Expect: requisição proveniente de um software HTTP/1.0.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_INVALID_RESP squid-3.4.4.1/errors/pt-br/ERR_INVALID_RESP --- squid-3.4.4/errors/pt-br/ERR_INVALID_RESP 2014-03-09 01:55:26.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    Resposta Inválida erro encontrado ao tentar processar a requisição:

    %R

    A mensagem da resposta HTTP recebida do servidor contatado não pode ser entendida ou estava mal-formada. Por favor, contate o administrador do site.

    Seu administrador do cache pode providenciar com maiores detalhes a exata natureza do problema, caso seja necessário.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_INVALID_URL squid-3.4.4.1/errors/pt-br/ERR_INVALID_URL --- squid-3.4.4/errors/pt-br/ERR_INVALID_URL 2014-03-09 01:55:27.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    URL inválida

    Alguma característica da URL requisitada é incorreta.

    Alguns dos possíveis problemas são:

    • Protocolo de acesso faltando ou incorreto (deveria ser http:// ou semelhante)

    • Nome do host faltando

    • Escape duplo ilegal na URL-Path

    • Caracter ilegal no nome de host; underscores não são permitidos.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_LIFETIME_EXP squid-3.4.4.1/errors/pt-br/ERR_LIFETIME_EXP --- squid-3.4.4/errors/pt-br/ERR_LIFETIME_EXP 2014-03-09 01:55:27.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Tempo de vida da conexão expirou

    Squid terminou a requisição porque foi excedido o tempo de vida máximo da conexão.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_NO_RELAY squid-3.4.4.1/errors/pt-br/ERR_NO_RELAY --- squid-3.4.4/errors/pt-br/ERR_NO_RELAY 2014-03-09 01:55:28.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Sem Wais Relay

    Não há nenhum host de relay de WAIS definido para esse Cache! Contate o administrador.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/pt-br/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/pt-br/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:55:28.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Um documento válido não foi encontrado no cache e a diretiva only-if-cached foi especificada.

    Você enviou uma requisição com a diretiva de controle de cache only-if-cached. O documento não foi encontrado no cache ou o cache requer uma revalidação, que é proibida pela diretiva only-if-cached.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/error-details.txt squid-3.4.4.1/errors/pt-br/error-details.txt --- squid-3.4.4/errors/pt-br/error-details.txt 2014-03-09 01:55:35.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/pt-br/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/pt-br/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/pt-br/ERR_PRECONDITION_FAILED 2014-03-09 01:55:29.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Précondição falhou.

    Isto significa:

    Pelo menos uma pré-condição especificada pelo cliente HTTP no cabeçalho da requisição falhou.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_READ_ERROR squid-3.4.4.1/errors/pt-br/ERR_READ_ERROR --- squid-3.4.4/errors/pt-br/ERR_READ_ERROR 2014-03-09 01:55:29.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Erro de Leitura

    O sistema retornou: %E

    Ocorreu uma condição de erro ao ler dados da rede. Por favor, repita sua requisição.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_READ_TIMEOUT squid-3.4.4.1/errors/pt-br/ERR_READ_TIMEOUT --- squid-3.4.4/errors/pt-br/ERR_READ_TIMEOUT 2014-03-09 01:55:30.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Tempo de leitura esgotado

    O sistema retornou: %E

    Tempo esgotado esperando a leitura de dados pela rede. A rede ou o servidor pode estar desconectado ou congestionado. Por favor, repita sua requisição.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/pt-br/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/pt-br/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:55:31.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Falha ao estabelecer uma conexão segura com %I

    The system returned:

    %E (TLS code: %x)

    %D

    Este proxy e o host remoto falharam em negociar uma configuração de segurança aceitável entre si para atender sua requisição. É possível que o host remoto não suporte conexões seguras ou que o proxy não está satisfeito com as credenciais de segurança do host.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/pt-br/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/pt-br/ERR_SHUTTING_DOWN 2014-03-09 01:55:31.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Este cache está sendo desligado e não pode atender sua requisição neste momento. Por favor, tente novamente em breve.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/pt-br/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/pt-br/ERR_SOCKET_FAILURE 2014-03-09 01:55:32.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Falha de socket

    O sistema retornou: %E

    Squid não pode criar um socket TCP, presumivelmente devido a uma carga excessiva. Por favor, repita sua requisição.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_TOO_BIG squid-3.4.4.1/errors/pt-br/ERR_TOO_BIG --- squid-3.4.4/errors/pt-br/ERR_TOO_BIG 2014-03-09 01:55:32.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    A requisição ou a resposta é muito grande.

    Se você está fazendo uma requisição POST ou PUT, então o item que você está tentando enviar é muito grande.

    Se você está fazendo uma requisição GET, então o item que você está tentando baixar é muito grande.

    Esses limites foram estabelecidos pelo Provedor de Serviço Internet que opera este cache. Por favor, contate-os diretamente se você acha que isso é um erro.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/pt-br/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/pt-br/ERR_UNSUP_HTTPVERSION 2014-03-09 01:55:33.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    Versão do HTTP não é suportada

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Unsupported HTTP version

    Este Squid não aceita a versão do HTTP que você está tentando usar.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_UNSUP_REQ squid-3.4.4.1/errors/pt-br/ERR_UNSUP_REQ --- squid-3.4.4/errors/pt-br/ERR_UNSUP_REQ 2014-03-09 01:55:33.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Método e Protocolo de Requisição Não-Suportado

    Squid não suporta todos os métodos de requisição para todos os protocolos de acesso. Por exemplo, você não pode emitir uma requisição POST ao protocolo Gopher.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_URN_RESOLVE squid-3.4.4.1/errors/pt-br/ERR_URN_RESOLVE --- squid-3.4.4/errors/pt-br/ERR_URN_RESOLVE 2014-03-09 01:55:34.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: The requested URN could not be retrieved

    ERROR

    Uma URL para a URN requisitada não pode ser recuperada

    O seguinte erro foi encontrado ao tentar recuperar a URN: %U

    Não é possível resolver URN

    Olha, não espere muito por URNs em %T :)

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_WRITE_ERROR squid-3.4.4.1/errors/pt-br/ERR_WRITE_ERROR --- squid-3.4.4/errors/pt-br/ERR_WRITE_ERROR 2014-03-09 01:55:34.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Erro ao enviar

    O sistema retornou: %E

    Ocorreu uma condição de erro ao escrever na rede. Por favor, repita sua requisição.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/pt-br/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/pt-br/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/pt-br/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:55:35.000000000 -0800 +++ squid-3.4.4.1/errors/pt-br/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERRO: A URL requisitada não pôde ser recuperada

    ERROR

    The requested URL could not be retrieved

    O seguinte erro foi encontrado ao tentar recuperar a URL: %U

    Resposta de tamanho zero

    Squid não recebeu nenhum dado para essa requisição.

    Seu administrador do cache é %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ro/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ro/ERR_ACCESS_DENIED 2014-03-09 01:56:03.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Acces interzis.

    Configuraţia de control al accesului împiedică ca cererea dumneavoastră să fie permisă în acest moment. Vă rugăm contactaţi furnizorul de servicii dacă credeţi că acest lucru nu este corect.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:56:04.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Aceste limite au fost impuse de către organizaţia care oferă serviciile de Internet şi care administreză acest cache. Vă rugăm să îi contactaţi în mod direct dacă sunteţi de părere că este o greşeală.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ro/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ro/ERR_AGENT_CONFIGURE 2014-03-09 01:56:04.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configurarea navigatorului de internet

    EROARE

    Web Browser Configuration

    Configurarea navigatorului de internet trebuie modificată pentru a putea utiliza această reţea.

    Cum să găseşti aceste setări în navigatorul tău:

    Pentru navigatorul Firefox mergeţi la:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    Pentru navigatorul Internet Explorer mergeţi la:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Pentru navigatorul Opera mergeţi la:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_AGENT_WPAD squid-3.4.4.1/errors/ro/ERR_AGENT_WPAD --- squid-3.4.4/errors/ro/ERR_AGENT_WPAD 2014-03-09 01:56:05.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Configurarea navigatorului de internet

    EROARE

    Web Browser Configuration

    Configurarea navigatorului de internet trebuie modificată pentru a putea utiliza această reţea.

    Cum să găseşti aceste setări în navigatorul tău:

    Pentru navigatorul Firefox mergeţi la:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    Pentru navigatorul Internet Explorer mergeţi la:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Selectează Detectează automat setările
    Pentru navigatorul Opera mergeţi la:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Selectează Configurare pentru proxy automată

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ro/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ro/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:56:06.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: Cache Access Denied

    ERROR

    Cache Acces interzis.

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Interzis accesul la cache.

    Ne pare rău, nu aveţi momentan permisiunea să accesaţi %U din acest cache până când nu vă autentificaţi.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:56:06.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: Cache Manager Access Denied

    ERROR

    Cache Manager Acces interzis.

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Interzis accesul la Managerul de cache.

    Ne pare rău, nu aveţi momentan permisiunea de a face cererea %U de la acest cache manager până când nu vă autentificaţi.

    Vă rugăm contactaţi administratorul cache-ului dacă aveţi dificultăţi în a vă autentifica sau, dacă sunteţi administratorul, citiţi documentaţia Squid despre interfaţa cache managerului şi verificaţi jurnalul cache pentru mesaje de eroare mai detaliate.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ro/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ro/ERR_CANNOT_FORWARD 2014-03-09 01:56:07.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Nu pot să forwardez această cerere la acest moment.

    This request could not be forwarded to the origin server or to any parent caches.

    Unele posibile probleme sunt:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ro/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ro/ERR_CONFLICT_HOST 2014-03-09 01:56:08.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Unele posibile probleme sunt:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ro/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ro/ERR_CONNECT_FAIL 2014-03-09 01:56:08.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Conexiunea la %I a eşuat.

    Sistemul de operare a returnat mesajul: %E

    Calculatorul sau reţeaua destinaţie s-ar putea să fie inoperabile. Vă rugăm să încercaţi cererea din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_DIR_LISTING squid-3.4.4.1/errors/ro/ERR_DIR_LISTING --- squid-3.4.4/errors/ro/ERR_DIR_LISTING 2014-03-09 01:56:09.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directorul: %U

    Directorul: %U/

    Conţinutul directorului:

    %z
    %g
    Director părinte (Director rădăcină)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_DNS_FAIL squid-3.4.4.1/errors/ro/ERR_DNS_FAIL --- squid-3.4.4/errors/ro/ERR_DNS_FAIL 2014-03-09 01:56:10.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Nu pot determina adresa IP din numele host-ului pentru %H

    Serverul DNS a răspuns:

    %z

    Aceasta înseamnă că serverul de cache nu a putut rezolva numele host-ului scris în URL. Verificaţi dacă adresa este corectă.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ESI squid-3.4.4.1/errors/ro/ERR_ESI --- squid-3.4.4/errors/ro/ERR_ESI 2014-03-09 01:56:10.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Procesarea ESI a eşuat.

    Procesorul ESI a răspuns:

    %Z

    Aceasta înseamnă ca proxy-ul intermediar nu a putut procesa modelul ESI. Vă rugăm să raportaţi această eroare webmaster-ului.

    Webmaster-ul este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ro/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ro/ERR_FORWARDING_DENIED 2014-03-09 01:56:11.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Înaintarea cererii este interzisă.

    Acest cache nu va înainta cererea dumneavoastră din cauză că încearcă să stabilească o relaţie de echivalenţă. Poate că clientul %i este un cache care a fost configurat greşit.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_DISABLED squid-3.4.4.1/errors/ro/ERR_FTP_DISABLED --- squid-3.4.4/errors/ro/ERR_FTP_DISABLED 2014-03-09 01:56:12.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    FTP este dezactivat

    Acest cache nu suportă protocolul FTP.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_FAILURE squid-3.4.4.1/errors/ro/ERR_FTP_FAILURE --- squid-3.4.4/errors/ro/ERR_FTP_FAILURE 2014-03-09 01:56:12.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    O eroare în protocolul FTP a survenit în timp ce se încerca accesarea URL-ului: %U

    Squid a trimis următoarea comandă FTP:

    %f

    Răspunsul serverului a fost:

    %F
    %g

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ro/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ro/ERR_FTP_FORBIDDEN 2014-03-09 01:56:13.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    Autentificarea FTP a eşuat în timp ce se încerca accesarea URL-ului: %U

    Squid a trimis următoarea comandă FTP:

    %f

    Răspunsul serverului a fost:

    %F
    %g

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ro/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ro/ERR_FTP_NOT_FOUND 2014-03-09 01:56:14.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    URL-ul următor nu a putut fi accesat: %U

    Squid a trimis următoarea comandă FTP:

    %f

    Răspunsul serverului a fost:

    %F
    %g

    Acest lucru poate fi cauzat de un URL FTP cu o cale absolută (ceea ce nu este conform RFC-ului 1738). Dacă aceasta este cauza, atunci fişierul poate fi găsit la %B.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ro/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ro/ERR_FTP_PUT_CREATED 2014-03-09 01:56:15.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operaţie reuşită

    Fişierul a fost creat


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ro/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ro/ERR_FTP_PUT_ERROR 2014-03-09 01:56:16.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: FTP upload failed

    ERROR

    FTP PUT upload failed

    O eroare în protocolul FTP a survenit în timp ce se încerca accesarea URL-ului: %U

    Squid a trimis următoarea comandă FTP:

    %f

    Răspunsul serverului a fost:

    %F

    Aceasta înseamnă probabil că serverul FTP nu are permisiunea sau spaţiul necesar pentru a stoca fişierul. Verificaţi calea, permisiunile, spaţiul pe disc şi încercaţi din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ro/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ro/ERR_FTP_PUT_MODIFIED 2014-03-09 01:56:17.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operaţie reuşită

    Fişierul a fost actualizat


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ro/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ro/ERR_FTP_UNAVAILABLE 2014-03-09 01:56:17.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    Serverul FTP a fost prea ocupat pentru a accesa URL-ul: %U

    Squid a trimis următoarea comandă FTP:

    %f

    Răspunsul serverului a fost:

    %F
    %g

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ro/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ro/ERR_GATEWAY_FAILURE 2014-03-09 01:56:18.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ro/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ro/ERR_ICAP_FAILURE 2014-03-09 01:56:18.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Eroare în protocolul ICAP.

    Sistemul de operare a returnat mesajul: %E

    Aceasta însemnă că o parte din comunicarea ICAP a eşuat.

    Unele posibile probleme sunt:

    • Serverul ICAP nu poate fi contactat.

    • S-a recepţionat un răspuns ilegal de la serverul ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_INVALID_REQ squid-3.4.4.1/errors/ro/ERR_INVALID_REQ --- squid-3.4.4/errors/ro/ERR_INVALID_REQ 2014-03-09 01:56:19.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    Eroarea Cerere invalidă a fost întâlnită în timp ce se încerca procesarea cererii:

    %R

    Unele posibile probleme sunt:

    • Metoda de cerere lipseşte sau nu este cunoscută.

    • Lipseşte URL-ul.

    • Lipseşte identificatorul HTTP (HTTP/1.0).

    • Cererea este prea mare.

    • Content-Length lipseşte pentru cererile POST sau PUT.

    • Caracter ilegal în numele staţiei; liniuţele de subliniere nu sunt permise.

    • HTTP/1.1 Capabilitatea Expect: este cerută de software HTTP/1.0.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_INVALID_RESP squid-3.4.4.1/errors/ro/ERR_INVALID_RESP --- squid-3.4.4/errors/ro/ERR_INVALID_RESP 2014-03-09 01:56:20.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    Eroarea Răspuns invalid a fost întâlnită în timp ce se încerca procesarea cererii:

    %R

    Mesajul HTTP primit de la serverul contactat nu a putut fi inţeles sau a fost malformat. Vă rugăm să contactaţi administratorul serverului respectiv.

    Administratorul cache-ului vă poate oferi mai multe detalii în legătură cu natura exactă a problemei dacă este nevoie.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_INVALID_URL squid-3.4.4.1/errors/ro/ERR_INVALID_URL --- squid-3.4.4/errors/ro/ERR_INVALID_URL 2014-03-09 01:56:20.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    URL invalid

    O parte a URL-ului cerut este incorectă.

    Unele posibile probleme sunt:

    • Protocolul de acces lipseşte sau nu este corect (ar trebui să fie http:// sau similar)

    • Lipseşte numele staţiei

    • Secvenţa escape-dublu este ilegală în calea URL

    • Caracter ilegal în numele staţiei; liniuţele de subliniere nu sunt permise.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ro/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ro/ERR_LIFETIME_EXP 2014-03-09 01:56:21.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Durata de viaţă a conexiunii a expirat

    Squid a terminat conexiunea din cauză că a depăşit durata maximă admisă pentru o conexiune.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_NO_RELAY squid-3.4.4.1/errors/ro/ERR_NO_RELAY --- squid-3.4.4/errors/ro/ERR_NO_RELAY 2014-03-09 01:56:21.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Nu există relay Wais

    Nu este definit niciun relay WAIS pentru acest cache! Strigaţi la administrator.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ro/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ro/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:56:22.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Un document valid nu a fost găsit în cache şi directiva only-if-cached (numai dacă este deja în cache) a fost specificată.

    Aţi cerut un document cu directiva only-if-cached (numai dacă există deja în cache). Documentul nu a fost găsit în cache, sau a necesitat o revalidare, revalidare interzisă de directiva only-if-cached.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/error-details.txt squid-3.4.4.1/errors/ro/error-details.txt --- squid-3.4.4/errors/ro/error-details.txt 2014-03-09 01:56:29.000000000 -0800 +++ squid-3.4.4.1/errors/ro/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ro/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ro/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ro/ERR_PRECONDITION_FAILED 2014-03-09 01:56:22.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_READ_ERROR squid-3.4.4.1/errors/ro/ERR_READ_ERROR --- squid-3.4.4/errors/ro/ERR_READ_ERROR 2014-03-09 01:56:23.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Eroare la citire

    Sistemul de operare a returnat mesajul: %E

    A survenit o eroare în timp ce se citeau date din reţea. Vă rugăm să încercaţi cererea din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ro/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ro/ERR_READ_TIMEOUT 2014-03-09 01:56:24.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Cererea de citire a expirat

    Sistemul de operare a returnat mesajul: %E

    S-a depăşit timpul de aşteptare în tipul citirii datelor de la reţea. Reţeaua sau serverul ar putea fi căzute sau congestionate. Vă rugăm să încercaţi din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ro/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ro/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:56:24.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    A eşuat stabilirea unei conexiuni securizate cu %I

    The system returned:

    %E (TLS code: %x)

    %D

    Acest proxy şi serverul cerut nu au putut negocia o modalitate de securizare mutual acceptabilă pentru a procesa cererea d-voastră. Este posibil ca serverul respectiv să nu suporte conexiuni securizate, sau că proxy-ul nu este satisfăcut de certificările de securitate ale serverului.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ro/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ro/ERR_SHUTTING_DOWN 2014-03-09 01:56:25.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Acest cache este în curs de închidere şi nu poate procesa cererea în acest moment. Vă rugăm să repetaţi cererea cât mai curând.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ro/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ro/ERR_SOCKET_FAILURE 2014-03-09 01:56:25.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Eroare de Socket

    Sistemul de operare a returnat mesajul: %E

    Squid nu poate crea un socket TCP, probabil din cauza încărcării excesive. Vă rugăm să încercaţi cererea din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_TOO_BIG squid-3.4.4.1/errors/ro/ERR_TOO_BIG --- squid-3.4.4/errors/ro/ERR_TOO_BIG 2014-03-09 01:56:26.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Cererea sau răspunsul este prea mare.

    În cazul în care faceţi o cerere POST sau PUT, ceea ce încercaţi să încărcaţi este prea mare.

    În cazul în care faceţi o cerere GET, ceea ce încercaţi să descărcaţi este prea mare.

    Aceste limite au fost impuse de către organizaţia care oferă serviciile de Internet şi care administreză acest cache. Vă rugăm să îi contactaţi în mod direct dacă sunteţi de părere că este o greşeală.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ro/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ro/ERR_UNSUP_HTTPVERSION 2014-03-09 01:56:26.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    Versiune HTTP nesuportată

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Unsupported HTTP version

    Acest Squid nu acceptă versiunea HTTP pe care încercaţi să o utilizaţi.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_UNSUP_REQ squid-3.4.4.1/errors/ro/ERR_UNSUP_REQ --- squid-3.4.4/errors/ro/ERR_UNSUP_REQ 2014-03-09 01:56:27.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Metodă de cerere şi protocol nesuportată

    Squid nu suportă toate metodele de cerere pentru toate protocoalele de acces. De exemplu, nu puteţi face o cerere de tip POST pentru Gopher.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_URN_RESOLVE squid-3.4.4.1/errors/ro/ERR_URN_RESOLVE --- squid-3.4.4/errors/ro/ERR_URN_RESOLVE 2014-03-09 01:56:27.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: The requested URN could not be retrieved

    ERROR

    Un URL pentru URN-ul cerut nu a putut fi accesat

    S-a recepţionat următoarea eroare când se încerca accesarea URN-ului: %U

    Nu se poate rezolva URN-ul

    Hei, nu vă aşteptaţi la prea multe de la URN-uri pe %T :)

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_WRITE_ERROR squid-3.4.4.1/errors/ro/ERR_WRITE_ERROR --- squid-3.4.4/errors/ro/ERR_WRITE_ERROR 2014-03-09 01:56:28.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Eroare la scriere

    Sistemul de operare a returnat mesajul: %E

    A survenit o eroare în timp ce se scriau date în reţea. Vă rugăm să încercaţi cererea din nou.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ro/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ro/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ro/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:56:29.000000000 -0800 +++ squid-3.4.4.1/errors/ro/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - EROARE: URL-ul cerut nu a putut fi accesat

    ERROR

    The requested URL could not be retrieved

    S-a recepţionat următoarea eroare când se încerca accesarea URL-ului: %U

    Răspuns de lungime zero

    Squid nu a recepţionat nici un fel de date pentru această cerere.

    Administratorul cache-ului este %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ACCESS_DENIED squid-3.4.4.1/errors/ru/ERR_ACCESS_DENIED --- squid-3.4.4/errors/ru/ERR_ACCESS_DENIED 2014-03-09 01:56:29.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Доступ запрещён.

    Система контроля доступа не позволяет выполнить ваш запрос сейчас. Обратитесь к вашему администратору.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:56:30.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Эти ограничения были установлены администратором. Свяжитесь с ним для получения информации.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/ru/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/ru/ERR_AGENT_CONFIGURE 2014-03-09 01:56:30.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Настройки браузера

    ОШИБКА

    Web Browser Configuration

    Необходимо произвести настройку вашего браузера для использования этой сети

    Эти настройки в вашем браузере:

    Для браузера Firefox перейдите в:
    • Инструменты -> Опции -> Дополнительно -> Сеть -> Настойки соединения
    • In the HTTP proxy box type the proxy name %h and port %b.
    Для браузера Internet Explorer перейдите в:
    • Инструменты -> Настройки интернета -> Соединения -> Настройки LAN -> Прокси
    • In the HTTP proxy box type the proxy name %h and port %b.
    Для браузера Opera перейдите в:
    • Инструменты -> Настройки -> Дополнительно -> Сеть -> Прокси-серверы
    • In the HTTP proxy box type the proxy name %h and port %b.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_AGENT_WPAD squid-3.4.4.1/errors/ru/ERR_AGENT_WPAD --- squid-3.4.4/errors/ru/ERR_AGENT_WPAD 2014-03-09 01:56:31.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Настройки браузера

    ОШИБКА

    Web Browser Configuration

    Необходимо произвести настройку вашего браузера для использования этой сети

    Эти настройки в вашем браузере:

    Для браузера Firefox перейдите в:
    • Инструменты -> Опции -> Дополнительно -> Сеть -> Настойки соединения
    • Select Auto-detect proxy settings for this network
    Для браузера Internet Explorer перейдите в:
    • Инструменты -> Настройки интернета -> Соединения -> Настройки LAN -> Прокси
    • Выберите Автоматически определять настройки
    Для браузера Opera перейдите в:
    • Инструменты -> Настройки -> Дополнительно -> Сеть -> Прокси-серверы
    • Выберите Использовать Автоматическое определение прокси

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/ru/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/ru/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:56:31.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Cache Access Denied

    ERROR

    Cache Доступ запрещён.

    При получении URL %U произошла следующая ошибка

    Доступ к кэшу запрещён.

    Извините, Вы не можете запросить %U из этого кэша до тех пор, пока не пройдёте аутентификацию.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:56:32.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Cache Manager Access Denied

    ERROR

    Cache Manager Доступ запрещён.

    При получении URL %U произошла следующая ошибка

    Доступ к управлению кэшем запрещён.

    Извините, Вы не можете запросить %U из системы управления кэшем до тех пор, пока не пройдете аутентификацию.

    Если у Вас возникли проблемы с аутентификацией, пожалуйста, свяжитесь с администратором кэша, если же Вы - администратор, прочитайте документацию по интерфейсу управления кэшем и проверьте файл протокола на предмет более детальных сообщений об ошибках.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/ru/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/ru/ERR_CANNOT_FORWARD 2014-03-09 01:56:33.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Невозможно переслать этот запрос в данное время.

    This request could not be forwarded to the origin server or to any parent caches.

    Возможные проблемы:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_CONFLICT_HOST squid-3.4.4.1/errors/ru/ERR_CONFLICT_HOST --- squid-3.4.4/errors/ru/ERR_CONFLICT_HOST 2014-03-09 01:56:33.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Возможные проблемы:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_CONNECT_FAIL squid-3.4.4.1/errors/ru/ERR_CONNECT_FAIL --- squid-3.4.4/errors/ru/ERR_CONNECT_FAIL 2014-03-09 01:56:34.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Соединение с %I не удалось

    Система вернула: %E

    Удаленный узел или сеть недоступен. Повторите запрос позднее

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_DIR_LISTING squid-3.4.4.1/errors/ru/ERR_DIR_LISTING --- squid-3.4.4/errors/ru/ERR_DIR_LISTING 2014-03-09 01:56:34.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Каталог: %U

    Каталог: %U/

    Содержимое каталога:

    %z
    %g
    Родительская директория (Корневая директория)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_DNS_FAIL squid-3.4.4.1/errors/ru/ERR_DNS_FAIL --- squid-3.4.4/errors/ru/ERR_DNS_FAIL 2014-03-09 01:56:35.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Невозможно определить IP-адрес по имени узла %H

    Сервер DNS ответил:

    %z

    Это означает, что кэш не смог распознать имя узла в URL. Проверьте адрес на корректность.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ESI squid-3.4.4.1/errors/ru/ERR_ESI --- squid-3.4.4/errors/ru/ERR_ESI 2014-03-09 01:56:36.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Обработка ESI не удалась.

    Обработчик ESI ответил:

    %Z

    Это означает, что заместитель не сумел обработать ESI-шаблон. Пожалуйста, сообщите об этой ошибке веб-мастеру.

    Ваш вебмастер: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/ru/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/ru/ERR_FORWARDING_DENIED 2014-03-09 01:56:36.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Пересылка запрещена.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_DISABLED squid-3.4.4.1/errors/ru/ERR_FTP_DISABLED --- squid-3.4.4/errors/ru/ERR_FTP_DISABLED 2014-03-09 01:56:37.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Протокол FTP отключён

    Этот кэш не поддерживает протокол FTP.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_FAILURE squid-3.4.4.1/errors/ru/ERR_FTP_FAILURE --- squid-3.4.4/errors/ru/ERR_FTP_FAILURE 2014-03-09 01:56:37.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Произошла ошибка протокола FTP при попытке получить URL: %U

    Squid послал следующую команду FTP:

    %f

    Сервер ответил:

    %F
    %g

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/ru/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/ru/ERR_FTP_FORBIDDEN 2014-03-09 01:56:38.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Произошла ошибка аутентификации FTP при попытке получить URL: %U

    Squid послал следующую команду FTP:

    %f

    Сервер ответил:

    %F
    %g

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/ru/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/ru/ERR_FTP_NOT_FOUND 2014-03-09 01:56:38.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Следующий URL не может быть получен: %U

    Squid послал следующую команду FTP:

    %f

    Сервер ответил:

    %F
    %g

    Это могло произойти из-за абсолютной ссылки на FTP (которая не соответствует RFC 1738). В этом случае файл может быть получен по адресу %B.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/ru/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/ru/ERR_FTP_PUT_CREATED 2014-03-09 01:56:39.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Копирование локального файла на FTP-сервер методом PUT завершено.

    Операция завершилась успешно

    Файл создан


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/ru/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/ru/ERR_FTP_PUT_ERROR 2014-03-09 01:56:39.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: FTP upload failed

    ERROR

    Произошла ошибка во время копирования локального файла на FTP-сервер методом PUT.

    Произошла ошибка протокола FTP при попытке получить URL: %U

    Squid послал следующую команду FTP:

    %f

    Сервер ответил:

    %F

    Это означает, что сервер FTP может не иметь прав или свободного места для хранения файла. Проверьте путь, права, свободное место и попробуйте снова.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/ru/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/ru/ERR_FTP_PUT_MODIFIED 2014-03-09 01:56:40.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Копирование локального файла на FTP-сервер методом PUT завершено.

    Операция завершилась успешно

    Файл обновлён


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/ru/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/ru/ERR_FTP_UNAVAILABLE 2014-03-09 01:56:40.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Сервер FTP слишком нагружен, чтобы получить URL: %U

    Squid послал следующую команду FTP:

    %f

    Сервер ответил:

    %F
    %g

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/ru/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/ru/ERR_GATEWAY_FAILURE 2014-03-09 01:56:41.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ICAP_FAILURE squid-3.4.4.1/errors/ru/ERR_ICAP_FAILURE --- squid-3.4.4/errors/ru/ERR_ICAP_FAILURE 2014-03-09 01:56:42.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Ошибка протокола ICAP.

    Система вернула: %E

    Это означает, что какой-то этап связи по протоколу ICAP не удался.

    Возможные проблемы:

    • Сервер ICAP недоступен

    • Получен недопустимый ответ от сервера ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_INVALID_REQ squid-3.4.4.1/errors/ru/ERR_INVALID_REQ --- squid-3.4.4/errors/ru/ERR_INVALID_REQ 2014-03-09 01:56:42.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Обнаружен недопустимый запрос:

    %R

    Возможные проблемы:

    • Отсутствует или неизвестен метод запроса.

    • Отсутствует URL.

    • Отсутствует идентификатор HTTP (HTTP/1.0).

    • Запрос слишком велик.

    • В запросе POST или PUT отсутствует заголовок Content-Length.

    • Недопустимый символ в имени узла (hostname), подчёркивания запрещены.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_INVALID_RESP squid-3.4.4.1/errors/ru/ERR_INVALID_RESP --- squid-3.4.4/errors/ru/ERR_INVALID_RESP 2014-03-09 01:56:43.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    Получен недопустимый ответ при попытке обработки запроса:

    %R

    Ответ HTTP, полученный от сервера, не может быть распознан, или он был неверно сформирован. Пожалуйста, свяжитесь с оператором сайта.

    Администратор Вашего кэша при необходимости может предоставить Вам более подробную информацию о действительных причинах проблемы.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_INVALID_URL squid-3.4.4.1/errors/ru/ERR_INVALID_URL --- squid-3.4.4/errors/ru/ERR_INVALID_URL 2014-03-09 01:56:43.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Недопустимый URL

    Какая-то часть запрашиваемого URL некорректна

    Возможные проблемы:

    • Отсутствет или неверено указан протокол (должно быть http:// или похоже)

    • Отсутствует имя узла (hostname)

    • Недопустимое двойное экранирование в пути URL (URL-Path)

    • Недопустимый символ в имени узла (hostname), подчёркивания запрещены.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_LIFETIME_EXP squid-3.4.4.1/errors/ru/ERR_LIFETIME_EXP --- squid-3.4.4/errors/ru/ERR_LIFETIME_EXP 2014-03-09 01:56:44.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Время жизни соединения истекло

    Squid прервал запрос из-за превышения максимального времени соединения.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_NO_RELAY squid-3.4.4.1/errors/ru/ERR_NO_RELAY --- squid-3.4.4/errors/ru/ERR_NO_RELAY 2014-03-09 01:56:44.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Wais Relay не определен

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/ru/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/ru/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:56:45.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Действительный документ не найден в кэше и указана деректива only-if-cached.

    Вы сделали запрос с директивой управления кэшем only-if-cached. Документ не был найден в кэше или он требует проверки достоверности, запрещённой директивой only-if-cached.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/error-details.txt squid-3.4.4.1/errors/ru/error-details.txt --- squid-3.4.4/errors/ru/error-details.txt 2014-03-09 01:56:52.000000000 -0800 +++ squid-3.4.4.1/errors/ru/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/ru/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/ru/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/ru/ERR_PRECONDITION_FAILED 2014-03-09 01:56:45.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_READ_ERROR squid-3.4.4.1/errors/ru/ERR_READ_ERROR --- squid-3.4.4/errors/ru/ERR_READ_ERROR 2014-03-09 01:56:46.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Ошибка чтения

    Система вернула: %E

    Ошибка при получении данных их сети. Повторите запрос.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_READ_TIMEOUT squid-3.4.4.1/errors/ru/ERR_READ_TIMEOUT --- squid-3.4.4/errors/ru/ERR_READ_TIMEOUT 2014-03-09 01:56:47.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Время ожидания при чтении истекло

    Система вернула: %E

    Превышен интервал времени ожидания при получении данных из сети. Сеть или сервер могут бытьнедоступны или перегружены. Повторите попытку позже.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/ru/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/ru/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:56:47.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Не удалось установить безопасное соединение с %I

    The system returned:

    %E (TLS code: %x)

    %D

    Для выполнения Вашего запроса этот кэш и удаленный узел не смогли согласовать взаимоприемлемые параметры безопасности. Возможно, удаленный узел не поддерживает безопасные соединения или кэш не удовлетворён удостоверением безопасности узла.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/ru/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/ru/ERR_SHUTTING_DOWN 2014-03-09 01:56:48.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Сервер в данный момент выключается и не может выполнить ваш запрос. Повторите попытку позже.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/ru/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/ru/ERR_SOCKET_FAILURE 2014-03-09 01:56:48.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Ошибка сокета

    Система вернула: %E

    Squid не может создать сокет TCP, предположительно из-за большой нагрузки. Пожалуйста, повторите запрос.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_TOO_BIG squid-3.4.4.1/errors/ru/ERR_TOO_BIG --- squid-3.4.4/errors/ru/ERR_TOO_BIG 2014-03-09 01:56:49.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Запрос или ответ слишком велик.

    Если Вы выполняете запрос POST или PUT, то отправляемый объект слишком велик.

    Если Вы выполняете запрос GET, то загружаемый объект слишком велик.

    Эти ограничения были установлены администратором. Свяжитесь с ним для получения информации.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/ru/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/ru/ERR_UNSUP_HTTPVERSION 2014-03-09 01:56:49.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    Неподдерживаемая версия HTTP

    При получении URL %U произошла следующая ошибка

    Unsupported HTTP version

    Данный Squid не принимает версию HTTP, которую вы пытаетесь использовать.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_UNSUP_REQ squid-3.4.4.1/errors/ru/ERR_UNSUP_REQ --- squid-3.4.4/errors/ru/ERR_UNSUP_REQ 2014-03-09 01:56:50.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Неподдерживаемый метод запроса или протокол

    Squid не поддерживает все методы запросов для всех протоколов. К примеру, для протокола Gopher Вы не можете выполнить запрос POST.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_URN_RESOLVE squid-3.4.4.1/errors/ru/ERR_URN_RESOLVE --- squid-3.4.4/errors/ru/ERR_URN_RESOLVE 2014-03-09 01:56:51.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: The requested URN could not be retrieved

    ERROR

    URL для запрошенного URN не может быть получен

    При получении URN %U произошла следующая ошибка

    Невозможно определить URN

    Не стоит ожидать чудес от URN-ов на %T :)

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_WRITE_ERROR squid-3.4.4.1/errors/ru/ERR_WRITE_ERROR --- squid-3.4.4/errors/ru/ERR_WRITE_ERROR 2014-03-09 01:56:51.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Ошибка записи

    Система вернула: %E

    Ошибка отправки данных. Повторите запрос

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/ru/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/ru/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/ru/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:56:52.000000000 -0800 +++ squid-3.4.4.1/errors/ru/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ОШИБКА: Запрошенный URL не может быть получен

    ERROR

    The requested URL could not be retrieved

    При получении URL %U произошла следующая ошибка

    Пустой ответ (нулевой длины)

    Squid не получил никаких данных в ответ на этот запрос.

    Администратор Вашего кэша: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ACCESS_DENIED squid-3.4.4.1/errors/sk/ERR_ACCESS_DENIED --- squid-3.4.4/errors/sk/ERR_ACCESS_DENIED 2014-03-09 01:56:52.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Prístup zamietnutý.

    Vašu požiadavku v tomto čase nebolo možné splniť kvôli konfigurácii riadenia prístupu. Ak si myslíte, že je to chyba, prosím, kontaktujte správcu daného systému.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:56:53.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Tieto obmedzenia zaviedol poskytovateľ tohto cache servera. Prosím, kontaktujte ho priamo ak máte pocit, že to je chyba.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/sk/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/sk/ERR_AGENT_CONFIGURE 2014-03-09 01:56:53.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Konfigurácia webového prehliadača

    CHYBA

    Web Browser Configuration

    Aby ste mohli používať túto sieť, musíte upraviť konfiguráciu vášho webového prehliadača.

    Ako nájsť tieto nastavenia vo vašom prehliadači:

    Prehliadače Firefox - choďte na:
    • Nástroje -> Možnosti -> Rozšírené -> Sieť -> Nastavenie pripojenia
    • In the HTTP proxy box type the proxy name %h and port %b.
    Prehliadače Internet Explorer - choďte na:
    • Nástroje -> Možnosti internetu -> Pripojenie -> Nastavenia LAN -> Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Prehliadače Opera - choďte na:
    • Nástroje -> Nastavenia -> Rozšírené -> Sieť -> Proxy servery
    • In the HTTP proxy box type the proxy name %h and port %b.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_AGENT_WPAD squid-3.4.4.1/errors/sk/ERR_AGENT_WPAD --- squid-3.4.4/errors/sk/ERR_AGENT_WPAD 2014-03-09 01:56:54.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Konfigurácia webového prehliadača

    CHYBA

    Web Browser Configuration

    Aby ste mohli používať túto sieť, musíte upraviť konfiguráciu vášho webového prehliadača.

    Ako nájsť tieto nastavenia vo vašom prehliadači:

    Prehliadače Firefox - choďte na:
    • Nástroje -> Možnosti -> Rozšírené -> Sieť -> Nastavenie pripojenia
    • Select Auto-detect proxy settings for this network
    Prehliadače Internet Explorer - choďte na:
    • Nástroje -> Možnosti internetu -> Pripojenie -> Nastavenia LAN -> Proxy
    • Vyberte Automaticky zistiť nastavenia
    Prehliadače Opera - choďte na:
    • Nástroje -> Nastavenia -> Rozšírené -> Sieť -> Proxy servery
    • Vyberte Automatická konfigurácia proxy

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/sk/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/sk/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:56:54.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Cache Access Denied

    ERROR

    Cache Prístup zamietnutý.

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Prístup ku cache zamietnutý.

    Ľutujeme, prístup k dokumentu %U z cache vám bude povolený až po tom ako sa autentifikujete.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:56:55.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Cache Manager Access Denied

    ERROR

    Cache Manager Prístup zamietnutý.

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Prístup k sprívcovi cache zamietnutý.

    Ľutujeme, prístup k dokumentu %U zo správcu cache vám bude povolený až po tom ako sa autentifikujete.

    Ak máte problém pri autentifikácii, kontaktujte prosím správcu cache. Ak vy sám ste správca, prečítajte si prosím dokumentáciu k rozhraniu správcu cache a prezrite si podrobnejšie chybové hlásenie v protokole cache.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/sk/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/sk/ERR_CANNOT_FORWARD 2014-03-09 01:56:56.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Požiadavku teraz nie je možné presmerovať.

    This request could not be forwarded to the origin server or to any parent caches.

    Niektoré možné problémy:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_CONFLICT_HOST squid-3.4.4.1/errors/sk/ERR_CONFLICT_HOST --- squid-3.4.4/errors/sk/ERR_CONFLICT_HOST 2014-03-09 01:56:56.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Niektoré možné problémy:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_CONNECT_FAIL squid-3.4.4.1/errors/sk/ERR_CONNECT_FAIL --- squid-3.4.4/errors/sk/ERR_CONNECT_FAIL 2014-03-09 01:56:57.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Spojenie k %I zlyhalo.

    Systém odpovedal: %E

    Vzdialený server alebo sieť môžu byť nedostupné. Prosím, opakujte svoju požiadavku.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_DIR_LISTING squid-3.4.4.1/errors/sk/ERR_DIR_LISTING --- squid-3.4.4/errors/sk/ERR_DIR_LISTING 2014-03-09 01:56:57.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Adresár: %U

    Adresár: %U/

    Obsah adresára:

    %z
    %g
    Rodičovský adresár (Koreňový adresár)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_DNS_FAIL squid-3.4.4.1/errors/sk/ERR_DNS_FAIL --- squid-3.4.4/errors/sk/ERR_DNS_FAIL 2014-03-09 01:56:58.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Nie je možné previesť názov počítača na IP adresu %H

    DNS server odpovedal:

    %z

    To znamená, že cache server nebol schopný získať adresu uvedenú v URL. Prosím, skontrolujte správnosť adresy.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ESI squid-3.4.4.1/errors/sk/ERR_ESI --- squid-3.4.4/errors/sk/ERR_ESI 2014-03-09 01:56:58.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Spracovanie ESI zlyhalo.

    ESI procesor vrátil:

    %Z

    To znamená, že zástupca nedokázal spracovať šablónu ESI. Prosím, ohláste túto chybu webmasterovi.

    Váš webmaster je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/sk/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/sk/ERR_FORWARDING_DENIED 2014-03-09 01:56:59.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Preposielanie zamietnuté.

    Tento server nepresmeruje vašu požiadavku, pretože sa pokúša o vynútenie vzťahu súrodenec. Možno je klient na %i cache server, ktorý bol zle nakonfigurovaný.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_DISABLED squid-3.4.4.1/errors/sk/ERR_FTP_DISABLED --- squid-3.4.4/errors/sk/ERR_FTP_DISABLED 2014-03-09 01:56:59.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    FTP je vypnuté

    Tento cache server nepodporuje protokol FTP.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_FAILURE squid-3.4.4.1/errors/sk/ERR_FTP_FAILURE --- squid-3.4.4/errors/sk/ERR_FTP_FAILURE 2014-03-09 01:57:00.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Vyskytla sa chyba protokolu FTP pri pokuse o prístup k URL: %U

    Squid odoslal nasledujúci FTP príkaz:

    %f

    Server odpovedal:

    %F
    %g

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/sk/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/sk/ERR_FTP_FORBIDDEN 2014-03-09 01:57:01.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse získať URL sa vyskytla chyba autentifikácie FTP: %U

    Squid odoslal nasledujúci FTP príkaz:

    %f

    Server odpovedal:

    %F
    %g

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/sk/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/sk/ERR_FTP_NOT_FOUND 2014-03-09 01:57:01.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Nasledovný URL je nedostupný: %U

    Squid odoslal nasledujúci FTP príkaz:

    %f

    Server odpovedal:

    %F
    %g

    To môže byť spôsobené uvedením absolútnej cesty v FTP URL (čo odporuje RFC 1738). V tom prípade by ste súbor mohli nájsť na %B.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/sk/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/sk/ERR_FTP_PUT_CREATED 2014-03-09 01:57:02.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operácia úspešná

    Súbor vytvorený


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/sk/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/sk/ERR_FTP_PUT_ERROR 2014-03-09 01:57:02.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: FTP upload failed

    ERROR

    FTP PUT upload failed

    Vyskytla sa chyba protokolu FTP pri pokuse o prístup k URL: %U

    Squid odoslal nasledujúci FTP príkaz:

    %f

    Server odpovedal:

    %F

    To znamená, že FTP server nemusí mať oprávnenie alebo priestor na uloženie súboru. Skontrolujte cestu, oprávnenia, miesto na disku a skúste to znova.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/sk/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/sk/ERR_FTP_PUT_MODIFIED 2014-03-09 01:57:03.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operácia úspešná

    Súbor aktualizovaný


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/sk/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/sk/ERR_FTP_UNAVAILABLE 2014-03-09 01:57:03.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    FTP server bol príliš zaneprázdnený pri pokuse získať nasledovný URL: %U

    Squid odoslal nasledujúci FTP príkaz:

    %f

    Server odpovedal:

    %F
    %g

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/sk/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/sk/ERR_GATEWAY_FAILURE 2014-03-09 01:57:04.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ICAP_FAILURE squid-3.4.4.1/errors/sk/ERR_ICAP_FAILURE --- squid-3.4.4/errors/sk/ERR_ICAP_FAILURE 2014-03-09 01:57:04.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Chyba protokoly ICAP.

    Systém odpovedal: %E

    To znamená, že niektorá časť komunikácie ICAP zlyhala.

    Niektoré možné problémy:

    • ICAP server nie je dostupný.

    • Od ICAP servera bola prijatá neplatná odpoveď.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_INVALID_REQ squid-3.4.4.1/errors/sk/ERR_INVALID_REQ --- squid-3.4.4/errors/sk/ERR_INVALID_REQ 2014-03-09 01:57:05.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Vyskytla sa chyba Neplatná požiadavka pri pokuse o spracovanie požiadavky:

    %R

    Niektoré možné problémy:

    • Chýbajúca alebo neznáma metóda požiadavky.

    • Chýbajúci URL.

    • Chýbajúci identifikátor HTTP (HTTP/1.0).

    • Požiadavka je príliš dlhá.

    • Chýbajúca položka Content-Length pre požiadavky POST alebo PUT.

    • Chybný znak v názve serveru; podčiarovník nie je povolený.

    • Vlastnosť Expect: verzie HTTP/1.1 sa požaduje od softvéru verzie HTTP/1.0.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_INVALID_RESP squid-3.4.4.1/errors/sk/ERR_INVALID_RESP --- squid-3.4.4/errors/sk/ERR_INVALID_RESP 2014-03-09 01:57:06.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Vyskytla sa chyba Neplatná odpoveď pri pokuse o spracovanie požiadavky:

    %R

    HTTP odpovedi prijatej z kontaktovaného servera nebolo možné porozumieť alebo bola nejako poškodená. Kontaktujte prosím správcu servera.

    V prípade potreby vám váš správca cache môže poskytnúť podrobnosti o presnej povahe problému.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_INVALID_URL squid-3.4.4.1/errors/sk/ERR_INVALID_URL --- squid-3.4.4/errors/sk/ERR_INVALID_URL 2014-03-09 01:57:06.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Neplatný URL

    Niektorá časť vami požadovaného URL je chybná.

    Niektoré možné problémy:

    • Chybný alebo chýbajúci protokol (mal by byť http:// alebo niečo podobné)

    • Chýbajúci názov servera

    • Chybná dvojitá úniková klauzula v URL-Path

    • Chybný znak v názve serveru; podčiarovník nie je povolený.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_LIFETIME_EXP squid-3.4.4.1/errors/sk/ERR_LIFETIME_EXP --- squid-3.4.4/errors/sk/ERR_LIFETIME_EXP 2014-03-09 01:57:07.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Životnosť pojenia vypršala

    Squid prerušil požiadavku, pretože bola prekročená maximálna dĺžka trvania spojenia.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_NO_RELAY squid-3.4.4.1/errors/sk/ERR_NO_RELAY --- squid-3.4.4/errors/sk/ERR_NO_RELAY 2014-03-09 01:57:07.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Žiadne relé WAIS

    Tento cache server nemá nastavený žiadny WAIS Relay server! Kričte na svojho správcu.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/sk/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/sk/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:57:08.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Vami požadovaný dokument sa nenachádza v cache, a bola uvedená direktíva only-if-cached.

    Vyslali ste požiadavku s direktívou only-if-cached na riadenie činnosti cache. Požadovaný dokument nebol nájdený v cache alebo tento dokument vyžaduje aktualizáciu pričom toto je direktívou only-if-cached obmedzené.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/error-details.txt squid-3.4.4.1/errors/sk/error-details.txt --- squid-3.4.4/errors/sk/error-details.txt 2014-03-09 01:57:15.000000000 -0800 +++ squid-3.4.4.1/errors/sk/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/sk/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/sk/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/sk/ERR_PRECONDITION_FAILED 2014-03-09 01:57:08.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_READ_ERROR squid-3.4.4.1/errors/sk/ERR_READ_ERROR --- squid-3.4.4/errors/sk/ERR_READ_ERROR 2014-03-09 01:57:09.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Chyba pri čítaní

    Systém odpovedal: %E

    Vyskytla sa chyba pri načítavaní údajov cez sieť. Prosím, opakujte svoju požiadavku.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_READ_TIMEOUT squid-3.4.4.1/errors/sk/ERR_READ_TIMEOUT --- squid-3.4.4/errors/sk/ERR_READ_TIMEOUT 2014-03-09 01:57:10.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Čas vypršal pri čítaní

    Systém odpovedal: %E

    Vyhradený čas vypršal počas čakania na načítanie dát zo siete. Sieť alebo server môžu byť mimo prevádzky alebo preťažené. Prosím, zopakujte svoju požiadavku.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/sk/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/sk/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:57:10.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Nepodarilo sa nadviazať zabezpečené spojenie s %I

    The system returned:

    %E (TLS code: %x)

    %D

    Táto proxy a vzdialený server sa nedokázali dohodnúť na vzájomne prijateľných bezpečnostných nastaveniach na spracovanie vašej požiadavky. Je možné, že vzdialený server nepodporuje zabezpečené pripojenia alebo že proxy server nie je spokojný s prihlasovacími údajmi hostiteľa.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/sk/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/sk/ERR_SHUTTING_DOWN 2014-03-09 01:57:11.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Táto cache sa práve vypína a nemôže spracovať vašu požiadavku. Prosím, zopakujte svoju požiadavku o chvíľu.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/sk/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/sk/ERR_SOCKET_FAILURE 2014-03-09 01:57:11.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Chyba socketu

    Systém odpovedal: %E

    Squid nie je schopný vytvoriť TCP socket pravdepodobne v dôsledku preťaženia. Prosím, opakujte svoju požiadavku.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_TOO_BIG squid-3.4.4.1/errors/sk/ERR_TOO_BIG --- squid-3.4.4/errors/sk/ERR_TOO_BIG 2014-03-09 01:57:12.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Požiadavka alebo odpoveď je príliš veľká.

    Ak vykonávate požiadavku POST alebo PUT, položka, ktorú sa snažíte nahrať je príliš veľká.

    Ak vykonávate požiadavku GET, položka, ktorú sa snažíte stiahnuť je príliš veľká.

    Tieto obmedzenia zaviedol poskytovateľ tohto cache servera. Prosím, kontaktujte ho priamo ak máte pocit, že to je chyba.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/sk/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/sk/ERR_UNSUP_HTTPVERSION 2014-03-09 01:57:12.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    Nepodporovaná verzia HTTP

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Unsupported HTTP version

    Tento Squid neprijíma HTTP verziu, ktorú sa pokúšate použiť.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_UNSUP_REQ squid-3.4.4.1/errors/sk/ERR_UNSUP_REQ --- squid-3.4.4/errors/sk/ERR_UNSUP_REQ 2014-03-09 01:57:13.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Nepodporovaná metóda a protokol požiadavky

    Squid nepodporuje všetky typy metód pri všetkých protokoloch. Napríklad: nie je možné použiť metódu POST pri službe Gopher.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_URN_RESOLVE squid-3.4.4.1/errors/sk/ERR_URN_RESOLVE --- squid-3.4.4/errors/sk/ERR_URN_RESOLVE 2014-03-09 01:57:13.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: The requested URN could not be retrieved

    ERROR

    URL pre požadované URN je nedostupné

    Pri pokuse o získanie URN sa vyskytla nasledovná chyba: %U

    Nemožno preložiť URN

    Hej, neočakávaj priveľa od URN na %T :)

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_WRITE_ERROR squid-3.4.4.1/errors/sk/ERR_WRITE_ERROR --- squid-3.4.4/errors/sk/ERR_WRITE_ERROR 2014-03-09 01:57:14.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Chyba pri zápise

    Systém odpovedal: %E

    Vyskytla sa chyba pri zápise do siete. Prosím, opakujte svoju požiadavku.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sk/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/sk/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/sk/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:57:15.000000000 -0800 +++ squid-3.4.4.1/errors/sk/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - CHYBA: Požadovaný URL nebolo možné získať

    ERROR

    The requested URL could not be retrieved

    Pri pokuse o získanie URL sa vyskytla nasledovná chyba: %U

    Odpoveď s nulovou veľkosťou

    Squid nedostal v odpovedi na túto požiadavku žiadne údaje.

    Vaším správcom cache je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ACCESS_DENIED squid-3.4.4.1/errors/sl/ERR_ACCESS_DENIED --- squid-3.4.4/errors/sl/ERR_ACCESS_DENIED 2014-03-09 01:57:15.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Dostop zavrnjen.

    Vaša zahteva trenutno ni odobrena, ker to preprečujejo nastavitve nadzora dostopa. Obrnite se na svojega ponudnika storitev, če se vam zdi, da je to neutemeljeno.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:57:16.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    Te omejitve je določil internetni ponudnik, ki oskrbuje ta predpomnilnik. Obrnite se neposredno nanj, če menite, da gre za napako.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/sl/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/sl/ERR_AGENT_CONFIGURE 2014-03-09 01:57:16.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Nastavitev spletnega brskalnika

    NAPAKA

    Web Browser Configuration

    Nastavitve vašega spletnega brskalnika je treba spremeniti, če naj uporablja to omrežje.

    Kako najdete te nastavitve v svojem brskalniku:

    Za brskalnike Firefox pojdite na:
    • Orodja -> Možnosti -> Napredno -> Omrežje -> Nastavitve povezave
    • V polje za posredniški strežnik HTTP vnesite ime posredniškega strežnika %h in vrata %b.
    Za brskalnike Internet Explorer pojdite na:
    • Orodja -> Internetne možnosti -> Povezava -> Nastavitve LAN ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Za brskalnike Opera pojdite na:
    • Orodja -> Nastavitve -> Napredno -> Omrežje -> Posredovalni strežniki
    • In the HTTP proxy box type the proxy name %h and port %b.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_AGENT_WPAD squid-3.4.4.1/errors/sl/ERR_AGENT_WPAD --- squid-3.4.4/errors/sl/ERR_AGENT_WPAD 2014-03-09 01:57:17.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Nastavitev spletnega brskalnika

    NAPAKA

    Web Browser Configuration

    Nastavitve vašega spletnega brskalnika je treba spremeniti, če naj uporablja to omrežje.

    Kako najdete te nastavitve v svojem brskalniku:

    Za brskalnike Firefox pojdite na:
    • Orodja -> Možnosti -> Napredno -> Omrežje -> Nastavitve povezave
    • Za to omrežje izberite samozaznavo nastavitev posredniškega strežnika
    Za brskalnike Internet Explorer pojdite na:
    • Orodja -> Internetne možnosti -> Povezava -> Nastavitve LAN ->Proxy
    • Izberite samodejno zaznavo nastavitev
    Za brskalnike Opera pojdite na:
    • Orodja -> Nastavitve -> Napredno -> Omrežje -> Posredovalni strežniki
    • Izberite uporabo samodejne konfiguracije posredniškega strežnika

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/sl/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/sl/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:57:18.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Cache Access Denied

    ERROR

    Cache Dostop zavrnjen.

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Dostop do predpomnilnika zavrnjen.

    Žal trenutno ne morete zahtevati %U od tega predpomnilnika, dokler ne potrdite svoje istovetnosti.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:57:18.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Cache Manager Access Denied

    ERROR

    Cache Manager Dostop zavrnjen.

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Dostop do upravitelja predpomnilnika zavrnjen.

    Žal trenutno ne morete zahtevati %U od tega upravitelja predpomnilnika, dokler ne potrdite svoje istovetnosti.

    Obrnite se na skrbnika predpomnilnika, če imate težave pri avtentikaciji; če pa ste skrbnik vi, se iz dokumentacije programa Squid poučite o vmesniku upravitelja predpomnilnika in v dnevniku predpomnilnika poiščite podrobnejša sporočila o napakah.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/sl/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/sl/ERR_CANNOT_FORWARD 2014-03-09 01:57:19.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Te zahteve trenutno ni mogoče posredovati.

    This request could not be forwarded to the origin server or to any parent caches.

    Težave so lahko med drugim:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_CONFLICT_HOST squid-3.4.4.1/errors/sl/ERR_CONFLICT_HOST --- squid-3.4.4/errors/sl/ERR_CONFLICT_HOST 2014-03-09 01:57:19.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Težave so lahko med drugim:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_CONNECT_FAIL squid-3.4.4.1/errors/sl/ERR_CONNECT_FAIL --- squid-3.4.4/errors/sl/ERR_CONNECT_FAIL 2014-03-09 01:57:20.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Povezava z %I ni uspela.

    Sistem je odvrnil: %E

    Oddaljeni gostitelj ali omrežje morda ne delujeta. Poskusite ponoviti zahtevo!

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_DIR_LISTING squid-3.4.4.1/errors/sl/ERR_DIR_LISTING --- squid-3.4.4/errors/sl/ERR_DIR_LISTING 2014-03-09 01:57:20.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Mapa: %U

    Mapa: %U/

    Vsebina mape:

    %z
    %g
    Nadrejeni imenik (Korenski imenik)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_DNS_FAIL squid-3.4.4.1/errors/sl/ERR_DNS_FAIL --- squid-3.4.4/errors/sl/ERR_DNS_FAIL 2014-03-09 01:57:21.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Ni možno določiti naslova IP iz imena gostitelja %H

    Strežnik DNS je odgovoril:

    %z

    To pomeni, da predpomnilnik ni mogel razrešiti imena gostitelja, navedenega v naslovu URL. Preverite, ali je naslov pravilen!

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ESI squid-3.4.4.1/errors/sl/ERR_ESI --- squid-3.4.4/errors/sl/ERR_ESI 2014-03-09 01:57:21.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Obdelava ESI ni uspela.

    Opravilnik ESI je odgovoril:

    %Z

    To pomeni, da namestnik ni mogel obdelati predloge ESI. Obvestite spletarja o tej napaki!

    Vaš spletar je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/sl/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/sl/ERR_FORWARDING_DENIED 2014-03-09 01:57:22.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Posredovanje zavrnjeno.

    Ta predpomnilnik ne bo posredoval vaše zahteve, ker skuša uveljaviti vrstniško povezavo. Odjemalec na naslovu %i je morda predpomnilnik, ki ni pravilno nastavljen.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_DISABLED squid-3.4.4.1/errors/sl/ERR_FTP_DISABLED --- squid-3.4.4/errors/sl/ERR_FTP_DISABLED 2014-03-09 01:57:22.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    FTP je onemogočen

    Ta predpomnilnik ne podpira FTP.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_FAILURE squid-3.4.4.1/errors/sl/ERR_FTP_FAILURE --- squid-3.4.4/errors/sl/ERR_FTP_FAILURE 2014-03-09 01:57:23.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake protokola FTP med poskusom nalaganja naslova URL: %U

    Squid je poslal naslednji ukaz FTP:

    %f

    Strežnik je odgovoril:

    %F
    %g

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/sl/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/sl/ERR_FTP_FORBIDDEN 2014-03-09 01:57:24.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Spodletela je avtentikacija FTP med poskusom nalaganja naslova URL: %U

    Squid je poslal naslednji ukaz FTP:

    %f

    Strežnik je odgovoril:

    %F
    %g

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/sl/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/sl/ERR_FTP_NOT_FOUND 2014-03-09 01:57:24.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Naslednjega naslova URL ni bilo mogoče naložiti: %U

    Squid je poslal naslednji ukaz FTP:

    %f

    Strežnik je odgovoril:

    %F
    %g

    Vzrok za to je morda FTP naslov URL z navedeno absolutno potjo (kar ni v skladu z RFC 1738). Če je to vzrok, lahko datoteko najdete na lokaciji %B.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/sl/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/sl/ERR_FTP_PUT_CREATED 2014-03-09 01:57:25.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT je uspel.

    Dejanje je uspelo

    Datoteka ustvarjena


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/sl/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/sl/ERR_FTP_PUT_ERROR 2014-03-09 01:57:25.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: FTP upload failed

    ERROR

    Pošiljanje FTP PUT ni uspelo

    Prišlo je do napake protokola FTP med poskusom nalaganja naslova URL: %U

    Squid je poslal naslednji ukaz FTP:

    %f

    Strežnik je odgovoril:

    %F

    To pomeni, da strežnik FTP morda nima dovoljenj ali prostora, da bi shranil datoteko. Preverite pot, dovoljenja in razpoložljivi prostor na disku ter poskusite znova.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/sl/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/sl/ERR_FTP_PUT_MODIFIED 2014-03-09 01:57:26.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT je uspel.

    Dejanje je uspelo

    Datoteka posodobljena


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/sl/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/sl/ERR_FTP_UNAVAILABLE 2014-03-09 01:57:26.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Strežnik FTP je bil prezaseden, da bi naložil naslov URL: %U

    Squid je poslal naslednji ukaz FTP:

    %f

    Strežnik je odgovoril:

    %F
    %g

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/sl/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/sl/ERR_GATEWAY_FAILURE 2014-03-09 01:57:27.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Napaka posredniškega prehoda

    Te zahteve ni mogoče izpolniti zaradi nepopravljive notranje napake ali napačnih nastavitev.

    To je lahko posledica omejitev, ki jih je določil internetni ponudnik, ki oskrbuje ta predpomnilnik. Za podrobnejše informacije se obrnite neposredno nanj.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ICAP_FAILURE squid-3.4.4.1/errors/sl/ERR_ICAP_FAILURE --- squid-3.4.4/errors/sl/ERR_ICAP_FAILURE 2014-03-09 01:57:27.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Napaka ICAP protokola.

    Sistem je odvrnil: %E

    To pomeni, da je med izmenjavo podatkov ICAP prišlo do napake.

    Težave so lahko med drugim:

    • Strežnik ICAP ni dosegljiv.

    • Odgovor, prejet od strežnika ICAP, je neveljaven.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_INVALID_REQ squid-3.4.4.1/errors/sl/ERR_INVALID_REQ --- squid-3.4.4/errors/sl/ERR_INVALID_REQ 2014-03-09 01:57:28.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake neveljavna zahteva med izvajanjem zahteve:

    %R

    Težave so lahko med drugim:

    • Manjkajoča ali neznana metoda zahteve.

    • Manjka naslov URL.

    • Manjka določilo HTTP (HTTP/1.0).

    • Zahteva je preobsežna.

    • Manjka podatek Content-Length za zahteve POST ali PUT.

    • Neveljaven znak v imenu gostitelja; podčrtaji niso dovoljeni.

    • Prvina HTTP/1.1 Expect: se zahteva od programa HTTP/1.0.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_INVALID_RESP squid-3.4.4.1/errors/sl/ERR_INVALID_RESP --- squid-3.4.4/errors/sl/ERR_INVALID_RESP 2014-03-09 01:57:29.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake neveljaven odgovor med izvajanjem zahteve:

    %R

    Z oddaljenega strežnika prejeto sporočilo HTTP Response je bilo nerazumljivo ali nepravilno oblikovano. Obrnite se na skrbnika spletišča.

    Po potrebi vam lahko skrbnik vašega predpomnilnika natančneje razloži, za kakšne vrste težavo gre.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_INVALID_URL squid-3.4.4.1/errors/sl/ERR_INVALID_URL --- squid-3.4.4/errors/sl/ERR_INVALID_URL 2014-03-09 01:57:29.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Neveljaven naslov URL

    Zahtevani naslov URL vsebuje nepravilnost.

    Težave so lahko med drugim:

    • Dostopni protokol manjka ali ni pravilen (moral bi biti http:// ipd.)

    • Manjka ime gostitelja

    • Neveljaven dvojni ubežni znak v poti URL-Path

    • Neveljaven znak v imenu gostitelja; podčrtaji niso dovoljeni.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_LIFETIME_EXP squid-3.4.4.1/errors/sl/ERR_LIFETIME_EXP --- squid-3.4.4/errors/sl/ERR_LIFETIME_EXP 2014-03-09 01:57:30.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Povezava je potekla

    Squid je prekinil zahtevo, ker je presegla maksimalno trajanje povezave.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_NO_RELAY squid-3.4.4.1/errors/sl/ERR_NO_RELAY --- squid-3.4.4/errors/sl/ERR_NO_RELAY 2014-03-09 01:57:30.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Ni relejnega strežnika WAIS

    Za ta predpomnilnik ni določen noben relejni strežnik WAIS! Znesite se nad skrbnikom.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/sl/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/sl/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:57:31.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    V predpomnilniku ni najti veljavnega dokumenta, podana pa je bila direktiva only-if-cached.

    Podali ste zahtevo s predpomnilniško kontrolno direktivo only-if-cached. Dokumenta ni bilo mogoče najti v predpomnilniku ali pa je zahteval ponovno preverjanje, ki ga direktiva only-if-cached ne dopušča.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/error-details.txt squid-3.4.4.1/errors/sl/error-details.txt --- squid-3.4.4/errors/sl/error-details.txt 2014-03-09 01:57:37.000000000 -0800 +++ squid-3.4.4.1/errors/sl/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/sl/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/sl/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/sl/ERR_PRECONDITION_FAILED 2014-03-09 01:57:31.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Pogoj ni izpolnjen.

    To pomeni:

    Vsaj eden izmed pogojev, ki jih je odjemalec HTTP navedel v zaglavju zahteve, je spodletel.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_READ_ERROR squid-3.4.4.1/errors/sl/ERR_READ_ERROR --- squid-3.4.4/errors/sl/ERR_READ_ERROR 2014-03-09 01:57:32.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Napaka pri branju

    Sistem je odvrnil: %E

    Med branjem podatkov iz omrežja je prišlo do napake. Ponovite zahtevo!

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_READ_TIMEOUT squid-3.4.4.1/errors/sl/ERR_READ_TIMEOUT --- squid-3.4.4/errors/sl/ERR_READ_TIMEOUT 2014-03-09 01:57:32.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Potekel je čas pri branju

    Sistem je odvrnil: %E

    Med čakanjem na branje podatkov iz omrežja je prišlo do zakasnitve. Morda omrežje ali strežnik ne delujeta ali sta preobremenjena. Ponovite zahtevo!

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/sl/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/sl/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:57:33.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Ni bilo mogoče vzpostaviti varne povezave z %I

    The system returned:

    %E (TLS code: %x)

    %D

    Ta predpomnilnik in oddaljeni gostitelj nista izpogajala obojestransko zadovoljivih varnostnih nastavitev, da bi lahko obdelala vašo zahtevo. Možno je, da oddaljeni gostitelj ne podpira varnih povezav ali pa njegova varnostna poverila ne zadoščajo temu predpomnilniku.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/sl/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/sl/ERR_SHUTTING_DOWN 2014-03-09 01:57:34.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Ta predpomnilnik se ravno zaustavlja in trenutno ne more obdelati vaše zahteve. Poskusite ponoviti zahtevo malo kasneje.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/sl/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/sl/ERR_SOCKET_FAILURE 2014-03-09 01:57:34.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Napaka vtičnice

    Sistem je odvrnil: %E

    Squid ne more ustvariti vtičnice TCP, verjetno zaradi preobremenitve. Ponovite zahtevo.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_TOO_BIG squid-3.4.4.1/errors/sl/ERR_TOO_BIG --- squid-3.4.4/errors/sl/ERR_TOO_BIG 2014-03-09 01:57:35.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Zahteva ali odgovor sta preobsežna.

    Če pošiljate zahtevo POST ali PUT, je predmet, ki ga skušate poslati, prevelik.

    Če pošiljate zahtevo GET, je predmet, ki ga skušate pridobiti, prevelik.

    Te omejitve je določil internetni ponudnik, ki oskrbuje ta predpomnilnik. Obrnite se neposredno nanj, če menite, da gre za napako.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/sl/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/sl/ERR_UNSUP_HTTPVERSION 2014-03-09 01:57:35.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    Nepodprta različica HTTP

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Unsupported HTTP version

    Ta Squid ne sprejema različice HTTP, ki jo skušate uporabiti.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_UNSUP_REQ squid-3.4.4.1/errors/sl/ERR_UNSUP_REQ --- squid-3.4.4/errors/sl/ERR_UNSUP_REQ 2014-03-09 01:57:36.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Nepodprta metoda zahteve in protokol

    Squid ne podpira vseh metod zahtev za vse protokole dostopa. Tako npr. metode POST ne morete uporabiti za zahtevo Gopher.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_URN_RESOLVE squid-3.4.4.1/errors/sl/ERR_URN_RESOLVE --- squid-3.4.4/errors/sl/ERR_URN_RESOLVE 2014-03-09 01:57:36.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: The requested URN could not be retrieved

    ERROR

    Ni bilo mogoče naložiti naslova URL za zahtevano ime URN

    Prišlo je do napake med poskusom nalaganja URN: %U

    Ni mogoče razrešiti imena URN

    Od imen URN na %T ne pričakujte preveč :)

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_WRITE_ERROR squid-3.4.4.1/errors/sl/ERR_WRITE_ERROR --- squid-3.4.4/errors/sl/ERR_WRITE_ERROR 2014-03-09 01:57:37.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Napaka pri pisanju

    Sistem je odvrnil: %E

    Med pisanjem v omrežje je prišlo do napake. Ponovite zahtevo!

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sl/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/sl/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/sl/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:57:37.000000000 -0800 +++ squid-3.4.4.1/errors/sl/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - NAPAKA: Zahtevanega naslova URL ni bilo mogoče naložiti

    ERROR

    The requested URL could not be retrieved

    Prišlo je do napake med poskusom nalaganja naslova URL: %U

    Odgovor z velikostjo nič

    Squid za to zahtevo ni prejel nobenih podatkov.

    Skrbnik vašega predpomnilnika je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ACCESS_DENIED squid-3.4.4.1/errors/sr-cyrl/ERR_ACCESS_DENIED --- squid-3.4.4/errors/sr-cyrl/ERR_ACCESS_DENIED 2014-03-09 01:57:38.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Access Denied.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:57:39.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/sr-cyrl/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/sr-cyrl/ERR_AGENT_CONFIGURE 2014-03-09 01:57:39.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_AGENT_WPAD squid-3.4.4.1/errors/sr-cyrl/ERR_AGENT_WPAD --- squid-3.4.4/errors/sr-cyrl/ERR_AGENT_WPAD 2014-03-09 01:57:40.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:57:41.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Access Denied

    ERROR

    Cache Access Denied.

    The following error was encountered while trying to retrieve the URL: %U

    Cache Access Denied.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:57:41.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: Cache Manager Access Denied

    ERROR

    Cache Manager Access Denied.

    The following error was encountered while trying to retrieve the URL: %U

    Cache Manager Access Denied.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/sr-cyrl/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/sr-cyrl/ERR_CANNOT_FORWARD 2014-03-09 01:57:42.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_CONFLICT_HOST squid-3.4.4.1/errors/sr-cyrl/ERR_CONFLICT_HOST --- squid-3.4.4/errors/sr-cyrl/ERR_CONFLICT_HOST 2014-03-09 01:57:42.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_CONNECT_FAIL squid-3.4.4.1/errors/sr-cyrl/ERR_CONNECT_FAIL --- squid-3.4.4/errors/sr-cyrl/ERR_CONNECT_FAIL 2014-03-09 01:57:43.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    The system returned: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_DIR_LISTING squid-3.4.4.1/errors/sr-cyrl/ERR_DIR_LISTING --- squid-3.4.4/errors/sr-cyrl/ERR_DIR_LISTING 2014-03-09 01:57:43.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_DNS_FAIL squid-3.4.4.1/errors/sr-cyrl/ERR_DNS_FAIL --- squid-3.4.4/errors/sr-cyrl/ERR_DNS_FAIL 2014-03-09 01:57:44.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ESI squid-3.4.4.1/errors/sr-cyrl/ERR_ESI --- squid-3.4.4/errors/sr-cyrl/ERR_ESI 2014-03-09 01:57:44.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/sr-cyrl/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/sr-cyrl/ERR_FORWARDING_DENIED 2014-03-09 01:57:45.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Forwarding Denied.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_DISABLED squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_DISABLED --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_DISABLED 2014-03-09 01:57:46.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP is Disabled

    This cache does not support FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_FAILURE squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_FAILURE --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_FAILURE 2014-03-09 01:57:46.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_FORBIDDEN 2014-03-09 01:57:47.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_NOT_FOUND 2014-03-09 01:57:47.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_CREATED 2014-03-09 01:57:48.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation successful

    File created


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_ERROR 2014-03-09 01:57:48.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: FTP upload failed

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED 2014-03-09 01:57:49.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operation successful

    File updated


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/sr-cyrl/ERR_FTP_UNAVAILABLE 2014-03-09 01:57:49.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid sent the following FTP command:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/sr-cyrl/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/sr-cyrl/ERR_GATEWAY_FAILURE 2014-03-09 01:57:50.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ICAP_FAILURE squid-3.4.4.1/errors/sr-cyrl/ERR_ICAP_FAILURE --- squid-3.4.4/errors/sr-cyrl/ERR_ICAP_FAILURE 2014-03-09 01:57:51.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    The system returned: %E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_INVALID_REQ squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_REQ --- squid-3.4.4/errors/sr-cyrl/ERR_INVALID_REQ 2014-03-09 01:57:51.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • Missing or unknown request method.

    • Missing URL.

    • Missing HTTP Identifier (HTTP/1.0).

    • Request is too large.

    • Content-Length missing for POST or PUT requests.

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_INVALID_RESP squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_RESP --- squid-3.4.4/errors/sr-cyrl/ERR_INVALID_RESP 2014-03-09 01:57:52.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_INVALID_URL squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_URL --- squid-3.4.4/errors/sr-cyrl/ERR_INVALID_URL 2014-03-09 01:57:52.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Invalid URL

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • Missing or incorrect access protocol (should be http:// or similar)

    • Missing hostname

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_LIFETIME_EXP squid-3.4.4.1/errors/sr-cyrl/ERR_LIFETIME_EXP --- squid-3.4.4/errors/sr-cyrl/ERR_LIFETIME_EXP 2014-03-09 01:57:53.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection Lifetime Expired

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_NO_RELAY squid-3.4.4.1/errors/sr-cyrl/ERR_NO_RELAY --- squid-3.4.4/errors/sr-cyrl/ERR_NO_RELAY 2014-03-09 01:57:54.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:57:54.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/error-details.txt squid-3.4.4.1/errors/sr-cyrl/error-details.txt --- squid-3.4.4/errors/sr-cyrl/error-details.txt 2014-03-09 01:58:03.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/sr-cyrl/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/sr-cyrl/ERR_PRECONDITION_FAILED 2014-03-09 01:57:55.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_READ_ERROR squid-3.4.4.1/errors/sr-cyrl/ERR_READ_ERROR --- squid-3.4.4/errors/sr-cyrl/ERR_READ_ERROR 2014-03-09 01:57:56.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Error

    The system returned: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_READ_TIMEOUT squid-3.4.4.1/errors/sr-cyrl/ERR_READ_TIMEOUT --- squid-3.4.4/errors/sr-cyrl/ERR_READ_TIMEOUT 2014-03-09 01:57:57.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Read Timeout

    The system returned: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:57:57.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/sr-cyrl/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/sr-cyrl/ERR_SHUTTING_DOWN 2014-03-09 01:57:58.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/sr-cyrl/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/sr-cyrl/ERR_SOCKET_FAILURE 2014-03-09 01:57:59.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Socket Failure

    The system returned: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_TOO_BIG squid-3.4.4.1/errors/sr-cyrl/ERR_TOO_BIG --- squid-3.4.4/errors/sr-cyrl/ERR_TOO_BIG 2014-03-09 01:58:00.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION 2014-03-09 01:58:00.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_UNSUP_REQ squid-3.4.4.1/errors/sr-cyrl/ERR_UNSUP_REQ --- squid-3.4.4/errors/sr-cyrl/ERR_UNSUP_REQ 2014-03-09 01:58:01.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported Request Method and Protocol

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_URN_RESOLVE squid-3.4.4.1/errors/sr-cyrl/ERR_URN_RESOLVE --- squid-3.4.4/errors/sr-cyrl/ERR_URN_RESOLVE 2014-03-09 01:58:02.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

    ERROR

    A URL for the requested URN could not be retrieved

    The following error was encountered while trying to retrieve the URN: %U

    Cannot Resolve URN

    Hey, don't expect too much from URNs on %T :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_WRITE_ERROR squid-3.4.4.1/errors/sr-cyrl/ERR_WRITE_ERROR --- squid-3.4.4/errors/sr-cyrl/ERR_WRITE_ERROR 2014-03-09 01:58:03.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Write Error

    The system returned: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:58:03.000000000 -0800 +++ squid-3.4.4.1/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid did not receive any data for this request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ACCESS_DENIED squid-3.4.4.1/errors/sr-latn/ERR_ACCESS_DENIED --- squid-3.4.4/errors/sr-latn/ERR_ACCESS_DENIED 2014-03-09 01:58:04.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Pristup nije dozvoljen.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:58:04.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/sr-latn/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/sr-latn/ERR_AGENT_CONFIGURE 2014-03-09 01:58:05.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    GREŠKA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_AGENT_WPAD squid-3.4.4.1/errors/sr-latn/ERR_AGENT_WPAD --- squid-3.4.4/errors/sr-latn/ERR_AGENT_WPAD 2014-03-09 01:58:06.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    GREŠKA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/sr-latn/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/sr-latn/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:58:06.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Cache Access Denied

    ERROR

    Cache Pristup nije dozvoljen.

    Greška učitavanja podataka sa adrese (URL): %U

    Pristup proksi/keš serveru nije dozvoljen.

    Na žalost nije vam dozvoljen da zahtev %U od ovog proksi servera ukoliko se ne autentifikujete.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:58:07.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Cache Manager Access Denied

    ERROR

    Cache Manager Pristup nije dozvoljen.

    Greška učitavanja podataka sa adrese (URL): %U

    Pristup proksi/keš server menadžeru nije dozvoljen.

    Na žalost nije vam dozvoljen da zahtevat %U od ovog keš menadžera ukoliko se ne autentifikujete.

    Molimo kontaktirajte proksi administratora ako imate probplema sa autentifikacijom ili, ako vi jeste administrator, pročitajte dokumentaciju o Squid keš menadžeru i proverite keš žurnal za detaljnije poruke o grešakama.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/sr-latn/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/sr-latn/ERR_CANNOT_FORWARD 2014-03-09 01:58:07.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Vaš zahtev ne može da se prosledi u ovom trenutku.

    This request could not be forwarded to the origin server or to any parent caches.

    Mogući problemi su:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_CONFLICT_HOST squid-3.4.4.1/errors/sr-latn/ERR_CONFLICT_HOST --- squid-3.4.4/errors/sr-latn/ERR_CONFLICT_HOST 2014-03-09 01:58:08.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Mogući problemi su:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_CONNECT_FAIL squid-3.4.4.1/errors/sr-latn/ERR_CONNECT_FAIL --- squid-3.4.4/errors/sr-latn/ERR_CONNECT_FAIL 2014-03-09 01:58:08.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Konekcija ka %I nije uspela.

    Odgovor sistema je: %E

    The remote host or network may be down. Please try the request again.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_DIR_LISTING squid-3.4.4.1/errors/sr-latn/ERR_DIR_LISTING --- squid-3.4.4/errors/sr-latn/ERR_DIR_LISTING 2014-03-09 01:58:09.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Direktorijum %U

    Direktorijum: %U/

    Sadržaj direktorijuma:

    %z
    %g
    Nadređeni direktorijum (Osnovni direktorijum)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_DNS_FAIL squid-3.4.4.1/errors/sr-latn/ERR_DNS_FAIL --- squid-3.4.4/errors/sr-latn/ERR_DNS_FAIL 2014-03-09 01:58:09.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Nije moguæe odrediti IP adresu iz imena raèunara za %H

    DNS server je vratio informaciju:

    %z

    što znaèi proksi server nije u stanju da identifikuje ime raèunara koje se nalazi u adresi (URL). Proverite da li je adresa ispravna.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ESI squid-3.4.4.1/errors/sr-latn/ERR_ESI --- squid-3.4.4/errors/sr-latn/ERR_ESI 2014-03-09 01:58:10.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    ESI obrada nije uspela.

    ESI procesor je vratio:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Vaš webmaster je %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/sr-latn/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/sr-latn/ERR_FORWARDING_DENIED 2014-03-09 01:58:10.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Prosleđivanje nije dozvoljeno.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_DISABLED squid-3.4.4.1/errors/sr-latn/ERR_FTP_DISABLED --- squid-3.4.4/errors/sr-latn/ERR_FTP_DISABLED 2014-03-09 01:58:11.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    FTP je onemogućen.

    Ovaj proksi server ne podržava FTP.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_FAILURE squid-3.4.4.1/errors/sr-latn/ERR_FTP_FAILURE --- squid-3.4.4/errors/sr-latn/ERR_FTP_FAILURE 2014-03-09 01:58:11.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška u FTP protokolu prilikom učitavanja adrese (URL): %U

    Squid je poslao sledeæu FTP komandu:

    %f

    Odgovor servera:

    %F
    %g

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/sr-latn/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/sr-latn/ERR_FTP_FORBIDDEN 2014-03-09 01:58:12.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Nije uspela FTP autentifikacija prilikom učitavanja adrese (URL): %U.

    Squid je poslao sledeæu FTP komandu:

    %f

    Odgovor servera:

    %F
    %g

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/sr-latn/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/sr-latn/ERR_FTP_NOT_FOUND 2014-03-09 01:58:13.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Adresa (URL) nije dostupna: %U

    Squid je poslao sledeæu FTP komandu:

    %f

    Odgovor servera:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_CREATED 2014-03-09 01:58:13.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacija uspešna

    Fajl je kreiran


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_ERROR 2014-03-09 01:58:14.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: FTP upload failed

    ERROR

    FTP PUT upload failed

    Greška u FTP protokolu prilikom učitavanja adrese (URL): %U

    Squid je poslao sledeæu FTP komandu:

    %f

    Odgovor servera:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/sr-latn/ERR_FTP_PUT_MODIFIED 2014-03-09 01:58:14.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operacija uspešna

    Fajl je osvežen


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/sr-latn/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/sr-latn/ERR_FTP_UNAVAILABLE 2014-03-09 01:58:15.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    FTP server je bio preopterećen prilikom učitavanja adrese (URL): %U

    Squid je poslao sledeæu FTP komandu:

    %f

    Odgovor servera:

    %F
    %g

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/sr-latn/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/sr-latn/ERR_GATEWAY_FAILURE 2014-03-09 01:58:15.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ICAP_FAILURE squid-3.4.4.1/errors/sr-latn/ERR_ICAP_FAILURE --- squid-3.4.4/errors/sr-latn/ERR_ICAP_FAILURE 2014-03-09 01:58:16.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Greška u ICAP protokolu.

    Odgovor sistema je: %E

    This means that some aspect of the ICAP communication failed.

    Mogući problemi su:

    • ICAP server je nedostupan.

    • Neispravan odgovor ICAP servera.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_INVALID_REQ squid-3.4.4.1/errors/sr-latn/ERR_INVALID_REQ --- squid-3.4.4/errors/sr-latn/ERR_INVALID_REQ 2014-03-09 01:58:16.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Neispravan zahtev greška prilikom obrade vašeg zahteva:

    %R

    Mogući problemi su:

    • Zahtevani metod pristupa je nepoznat.

    • Nedostaje adresa (URL).

    • Nedostaje HTTP identifikator (HTTP/1.0).

    • Zahtev je prevelik.

    • Nedostaje dužina sadržaja za POST ili PUT zahtev.

    • Nedozvoljeni karakteri u imenu računara; donja crta (_) nije dozvoljena.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_INVALID_RESP squid-3.4.4.1/errors/sr-latn/ERR_INVALID_RESP --- squid-3.4.4/errors/sr-latn/ERR_INVALID_RESP 2014-03-09 01:58:17.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Neispravan odgovor greška prilikom obrade vašeg zahteva:

    %R

    HTTP odgovor dobijen od kontaktiranog servera nije moguće razumeti ili je na neki način pogrešno formiran. Molimo kontaktirajte operatora sajta.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_INVALID_URL squid-3.4.4.1/errors/sr-latn/ERR_INVALID_URL --- squid-3.4.4/errors/sr-latn/ERR_INVALID_URL 2014-03-09 01:58:17.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Neispravna adresa (URL)

    Jedan od aspekata zahtevane adrese (URL) nije ispravan.

    Mogući problemi su:

    • Protokol pristupa je neispravan (treba da bude http:// ili slično)

    • Nedostaje ime računara (servera)

    • Nedozvoljene dvostruke "escape" sekvence u URL putanji

    • Nedozvoljeni karakteri u imenu računara; donja crta (_) nije dozvoljena.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_LIFETIME_EXP squid-3.4.4.1/errors/sr-latn/ERR_LIFETIME_EXP --- squid-3.4.4/errors/sr-latn/ERR_LIFETIME_EXP 2014-03-09 01:58:18.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Trajanje konekcije prekoračeno

    Squid Proksi server je prekinuo konekciju jer je prekoraèila dozvoljeno trajanje konekcije.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_NO_RELAY squid-3.4.4.1/errors/sr-latn/ERR_NO_RELAY --- squid-3.4.4/errors/sr-latn/ERR_NO_RELAY 2014-03-09 01:58:18.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Nema Wais servera

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:58:19.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    U kešu nije naðen validan dokument a specificirane je direktiva only-if-cached.

    Za vaš zahtev postavljena je only-if-cached proksi direktiva.Dokument nije naðen u proksi arhivi, ili se zahteva revalidacija kojaje zabranjena direktivom only-if-cached.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/error-details.txt squid-3.4.4.1/errors/sr-latn/error-details.txt --- squid-3.4.4/errors/sr-latn/error-details.txt 2014-03-09 01:58:26.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/sr-latn/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/sr-latn/ERR_PRECONDITION_FAILED 2014-03-09 01:58:20.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_READ_ERROR squid-3.4.4.1/errors/sr-latn/ERR_READ_ERROR --- squid-3.4.4/errors/sr-latn/ERR_READ_ERROR 2014-03-09 01:58:20.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Greška čitanja

    Odgovor sistema je: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_READ_TIMEOUT squid-3.4.4.1/errors/sr-latn/ERR_READ_TIMEOUT --- squid-3.4.4/errors/sr-latn/ERR_READ_TIMEOUT 2014-03-09 01:58:21.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Zastoj čitanja

    Odgovor sistema je: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/sr-latn/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/sr-latn/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:58:21.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Nije uspelo uspostavljanje sigurne veze sa %I

    The system returned:

    %E (TLS code: %x)

    %D

    Ovaj proksi i udaljeni server nisu uspeli da se dogovore oko sigunosnih podešavanja za izvršavanje vašeg zahteva. Moguce je da je udaljeni server ne podržava sigune konekcije, ili da proksi nije zadovoljan sa pravilima sigunosti udaljenog servera.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/sr-latn/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/sr-latn/ERR_SHUTTING_DOWN 2014-03-09 01:58:22.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/sr-latn/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/sr-latn/ERR_SOCKET_FAILURE 2014-03-09 01:58:22.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Greška prilikom uspostavljanja konekcije (Socket)

    Odgovor sistema je: %E

    Squid nije u stanju da kreira TCP socket, verovatno zbog preoptereæenosti. Molimo pokušajte ponovo.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_TOO_BIG squid-3.4.4.1/errors/sr-latn/ERR_TOO_BIG --- squid-3.4.4/errors/sr-latn/ERR_TOO_BIG 2014-03-09 01:58:23.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Zahtev ili odgovor je prevelik.

    Ukoliko je vaš zahtev POST ili PUT, onda je podatak koji pokušavate da upišete prevelik.

    Ako ste uputili GET zahtev, onda je podatak koji tražite prevelik.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/sr-latn/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/sr-latn/ERR_UNSUP_HTTPVERSION 2014-03-09 01:58:23.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    Unsupported HTTP version

    Greška učitavanja podataka sa adrese (URL): %U

    Unsupported HTTP version

    Squid server ne može da obradi HTTP verziju koju koristite.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_UNSUP_REQ squid-3.4.4.1/errors/sr-latn/ERR_UNSUP_REQ --- squid-3.4.4/errors/sr-latn/ERR_UNSUP_REQ 2014-03-09 01:58:24.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Nepodržan metod ili protokol zahteva (Request)

    Squid Proksi server ne podržava sve metode zahteva za sve moguæe pristupne protokole. Na primer ne možete da uradite POST na Gopher zahtev.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_URN_RESOLVE squid-3.4.4.1/errors/sr-latn/ERR_URN_RESOLVE --- squid-3.4.4/errors/sr-latn/ERR_URN_RESOLVE 2014-03-09 01:58:25.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: The requested URN could not be retrieved

    ERROR

    Adresa (URL) za traženi podatak (URN) ne može da se učita

    Greška učitavanja podataka (URN): %U

    Nije moguće prepoznati URN

    Hej, ne očekuj previše od URN-a na %T :)

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_WRITE_ERROR squid-3.4.4.1/errors/sr-latn/ERR_WRITE_ERROR --- squid-3.4.4/errors/sr-latn/ERR_WRITE_ERROR 2014-03-09 01:58:25.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Greška u upisu

    Odgovor sistema je: %E

    An error condition occurred while writing to the network. Please retry your request.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sr-latn/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/sr-latn/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/sr-latn/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:58:26.000000000 -0800 +++ squid-3.4.4.1/errors/sr-latn/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - GREŠKA: Tražena adresa (URL) ne može da se učita

    ERROR

    The requested URL could not be retrieved

    Greška učitavanja podataka sa adrese (URL): %U

    Odgovor nulte dužine

    Squid proksi nije dobio nikakve podatke na vaš zahtev.

    Vaš keš/proksi administrator je: %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ACCESS_DENIED squid-3.4.4.1/errors/sv/ERR_ACCESS_DENIED --- squid-3.4.4/errors/sv/ERR_ACCESS_DENIED 2014-03-09 01:58:26.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Tillträde Nekas.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:58:27.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/sv/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/sv/ERR_AGENT_CONFIGURE 2014-03-09 01:58:27.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    FEL

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_AGENT_WPAD squid-3.4.4.1/errors/sv/ERR_AGENT_WPAD --- squid-3.4.4/errors/sv/ERR_AGENT_WPAD 2014-03-09 01:58:28.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    FEL

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/sv/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/sv/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:58:28.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Cache Access Denied

    ERROR

    Cache Tillträde Nekas.

    Följande fel påträffades vid hämtning av URL: %U

    Tillträde till Cache Nekas.

    Ledsen, Ni är förnärvarande ej berättigad att begära %U från denna cache tills det att Ni har autentifierat Er.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:58:29.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Cache Manager Access Denied

    ERROR

    Cache Manager Tillträde Nekas.

    Följande fel påträffades vid hämtning av URL: %U

    Tillträde till Cachehanteraren Nekas.

    Ledsen, Ni är förnärvarande ej berättigad att begära %U från denna cache tills det att Ni har autentifierat Er.

    Vänligen kontakta cacheadministratorn om Ni har svårigheter med att autentifiera Er själv, om Ni är administratorn, läs Squid dokumentationen om cache hanterar interfacet och kontrollera cache loggen för mer detaljerade felmeddelanden.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/sv/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/sv/ERR_CANNOT_FORWARD 2014-03-09 01:58:30.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Kunde ej vidarebefodra förfrågan vid detta tillfälle.

    This request could not be forwarded to the origin server or to any parent caches.

    Några möjliga problem är:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_CONFLICT_HOST squid-3.4.4.1/errors/sv/ERR_CONFLICT_HOST --- squid-3.4.4/errors/sv/ERR_CONFLICT_HOST 2014-03-09 01:58:30.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Några möjliga problem är:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_CONNECT_FAIL squid-3.4.4.1/errors/sv/ERR_CONNECT_FAIL --- squid-3.4.4/errors/sv/ERR_CONNECT_FAIL 2014-03-09 01:58:31.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Anslutnings att %I misslyckades.

    Systemet returnerade: %E

    The remote host or network may be down. Please try the request again.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_DIR_LISTING squid-3.4.4.1/errors/sv/ERR_DIR_LISTING --- squid-3.4.4/errors/sv/ERR_DIR_LISTING 2014-03-09 01:58:31.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Katalog: %U

    Katalog: %U/

    Kataloginnehåll:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_DNS_FAIL squid-3.4.4.1/errors/sv/ERR_DNS_FAIL --- squid-3.4.4/errors/sv/ERR_DNS_FAIL 2014-03-09 01:58:32.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Kunde inte få fram IP-adressen för värdnamnet %H

    DNS namnservern svarade:

    %z

    Detta betyder att cachen kunde inte lösa upp värdnamnet angivet i begärd URL. Kontrollera att adressen är korrekt.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ESI squid-3.4.4.1/errors/sv/ERR_ESI --- squid-3.4.4/errors/sv/ERR_ESI 2014-03-09 01:58:32.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    ESI bearbetning misslyckades.

    ESI motorn returnerade:

    %Z

    Detta betyder att surrogat servern kunde inte bearbeta ESI mallen. Vänligen kontakta den ansvariga för webbservern ifråga.

    Addressen till ansvarig administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/sv/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/sv/ERR_FORWARDING_DENIED 2014-03-09 01:58:33.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Vidarebefodran Nekad.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_DISABLED squid-3.4.4.1/errors/sv/ERR_FTP_DISABLED --- squid-3.4.4/errors/sv/ERR_FTP_DISABLED 2014-03-09 01:58:33.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    FTP är Avstängd

    Denna cache stödjer inte FTP.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_FAILURE squid-3.4.4.1/errors/sv/ERR_FTP_FAILURE --- squid-3.4.4/errors/sv/ERR_FTP_FAILURE 2014-03-09 01:58:34.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Ett FTP protokollfel inträffade vid försöket att hämta URL: %U

    Squid sände följande FTP kommando:

    %f

    Servern svarade med:

    %F
    %g

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/sv/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/sv/ERR_FTP_FORBIDDEN 2014-03-09 01:58:34.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Ett misslyckande vid FTP autentifiering inträffade vid försöket att hämta URL: %U

    Squid sände följande FTP kommando:

    %f

    Servern svarade med:

    %F
    %g

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/sv/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/sv/ERR_FTP_NOT_FOUND 2014-03-09 01:58:35.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande URL kunde inte hämtas: %U

    Squid sände följande FTP kommando:

    %f

    Servern svarade med:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/sv/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/sv/ERR_FTP_PUT_CREATED 2014-03-09 01:58:36.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operationen lyckades

    Filein skapades


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/sv/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/sv/ERR_FTP_PUT_ERROR 2014-03-09 01:58:36.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: FTP upload failed

    ERROR

    FTP PUT upload failed

    Ett FTP protokollfel inträffade vid försöket att hämta URL: %U

    Squid sände följande FTP kommando:

    %f

    Servern svarade med:

    %F

    Detta betyder att rättighet eller utrymme saknas på FTP servern för att lagra filen. Kontrollera sökväg, rättigheter och diskutrymme och försök igen.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/sv/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/sv/ERR_FTP_PUT_MODIFIED 2014-03-09 01:58:37.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Operationen lyckades

    Filen uppdaterades


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/sv/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/sv/ERR_FTP_UNAVAILABLE 2014-03-09 01:58:37.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    FTP servern var ej tillgänglig vid försöket att hämta URL: %U

    Squid sände följande FTP kommando:

    %f

    Servern svarade med:

    %F
    %g

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/sv/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/sv/ERR_GATEWAY_FAILURE 2014-03-09 01:58:38.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ICAP_FAILURE squid-3.4.4.1/errors/sv/ERR_ICAP_FAILURE --- squid-3.4.4/errors/sv/ERR_ICAP_FAILURE 2014-03-09 01:58:38.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    ICAP protokollfel.

    Systemet returnerade: %E

    Detta betyder att ICAP kommunikationen misslyckades.

    Några möjliga problem är:

    • ICAP servern är ej nåbar.

    • Svaret från ICAP servern är ogiltigt och kan inte tolkas.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_INVALID_REQ squid-3.4.4.1/errors/sv/ERR_INVALID_REQ --- squid-3.4.4/errors/sv/ERR_INVALID_REQ 2014-03-09 01:58:39.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Felaktig Förfråan fel påträffades när förfrågan skulle behandlas:

    %R

    Några möjliga problem är:

    • Avsaknad eller okänd method för förfrågan.

    • URL saknas.

    • Avsaknad HTTP identifierare (HTTP/1.0).

    • Förfrågan är för stor.

    • Content-Length saknas i POST eller PUT begäran.

    • Ej tillåtet tecken i värdnamnet; understryckningstecken är ej tillåtna.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_INVALID_RESP squid-3.4.4.1/errors/sv/ERR_INVALID_RESP --- squid-3.4.4/errors/sv/ERR_INVALID_RESP 2014-03-09 01:58:39.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Felaktigt Svarsmeddelande fel påträffades när förfrågan skulle behandlas:

    %R

    HTTP svarsmeddelandet ifrån den kontaktade servern är felaktigt och kunde inte tolkas. Vänligen kontakta den ansvariga för webbservern ifråga.

    Din cacheserver administratör man eventuellt ge dig mera information om det specifika problemet med denna sida.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_INVALID_URL squid-3.4.4.1/errors/sv/ERR_INVALID_URL --- squid-3.4.4/errors/sv/ERR_INVALID_URL 2014-03-09 01:58:40.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Felaktig URL

    Någon eller några aspekter av begärd URL är inkorrekta.

    Några möjliga problem är:

    • Avsaknat eller felaktigt tillträdesprotokoll (ska vara http:// eller liknande)

    • Avsaknat värdnamn

    • Ej tillåten dubbel-escape i URL-Sökvägen

    • Ej tillåtet tecken i värdnamnet; understryckningstecken är ej tillåtna.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_LIFETIME_EXP squid-3.4.4.1/errors/sv/ERR_LIFETIME_EXP --- squid-3.4.4/errors/sv/ERR_LIFETIME_EXP 2014-03-09 01:58:40.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Anslutnings levnadstid tog slut

    Squid har avbrutit begäran på grund av att den har överskridikt den tillåtna livstiden för en anslutning.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_NO_RELAY squid-3.4.4.1/errors/sv/ERR_NO_RELAY --- squid-3.4.4/errors/sv/ERR_NO_RELAY 2014-03-09 01:58:41.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Igen Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/sv/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/sv/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:58:42.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Senaste dokumentet återfanns inte i cachen och only-if-cached direktivet är satt.

    Du har begärt ett dokument med only-if-cached cache kontroll direktivet. Dokumentet återfanns inte i cache databasen, eller det krävs en uppdatering av cache databasen, men förhindras av only-if-cached direktivet.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/error-details.txt squid-3.4.4.1/errors/sv/error-details.txt --- squid-3.4.4/errors/sv/error-details.txt 2014-03-09 01:58:49.000000000 -0800 +++ squid-3.4.4.1/errors/sv/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/sv/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/sv/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/sv/ERR_PRECONDITION_FAILED 2014-03-09 01:58:42.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_READ_ERROR squid-3.4.4.1/errors/sv/ERR_READ_ERROR --- squid-3.4.4/errors/sv/ERR_READ_ERROR 2014-03-09 01:58:43.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Läsfel

    Systemet returnerade: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_READ_TIMEOUT squid-3.4.4.1/errors/sv/ERR_READ_TIMEOUT --- squid-3.4.4/errors/sv/ERR_READ_TIMEOUT 2014-03-09 01:58:43.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Läsningen fick en timeout

    Systemet returnerade: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/sv/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/sv/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:58:44.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Misslyckades med att öppna en säker anslutning till %I

    The system returned:

    %E (TLS code: %x)

    %D

    Denna proxy server och kontaktad server misslyckades med att förhandla fram en accepterbar säkerhetsinställning för hanteringen av din begäran. Det är möjligt att kontaktad server inte stödjer säkra anslutningar, eller att proxy servern inte r nöjd med de säkerhets alternativ eller certifikat som presenterades av servern.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/sv/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/sv/ERR_SHUTTING_DOWN 2014-03-09 01:58:44.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/sv/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/sv/ERR_SOCKET_FAILURE 2014-03-09 01:58:45.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Socket Fel

    Systemet returnerade: %E

    Squid kan inte skapa en TCP socket, gissningsvis på grund av tung last. Vänligen försök igen.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_TOO_BIG squid-3.4.4.1/errors/sv/ERR_TOO_BIG --- squid-3.4.4/errors/sv/ERR_TOO_BIG 2014-03-09 01:58:45.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Begäran är för stor.

    Ifall du utför en POST eller PUT begäran, så är begäran du försöker ladda upp för stor.

    Ifall du utförde en GET begäran, så är svaret du försöker ladda ned för stort.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/sv/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/sv/ERR_UNSUP_HTTPVERSION 2014-03-09 01:58:46.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    Icke stödd HTTP version

    Följande fel påträffades vid hämtning av URL: %U

    Unsupported HTTP version

    Squid fungerar inte med den versionen av HTTP som du försöker använda

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_UNSUP_REQ squid-3.4.4.1/errors/sv/ERR_UNSUP_REQ --- squid-3.4.4/errors/sv/ERR_UNSUP_REQ 2014-03-09 01:58:47.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Ej stöd för begärd Metod och Protokoll

    Squid stödjer inte alla frågemetoder för alla protokoll. Till exempel, Ni kan inte POST'a en Gopher förfrågan.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_URN_RESOLVE squid-3.4.4.1/errors/sv/ERR_URN_RESOLVE --- squid-3.4.4/errors/sv/ERR_URN_RESOLVE 2014-03-09 01:58:48.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: The requested URN could not be retrieved

    ERROR

    En URL för begärd URN kunde inte hämtas

    Följande fel påträffades vid hämtning av URN: %U

    Kan inte lösa upp URN namnet

    Men hallå, förvänta dig inte för mycket från en URNs på %T :)

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_WRITE_ERROR squid-3.4.4.1/errors/sv/ERR_WRITE_ERROR --- squid-3.4.4/errors/sv/ERR_WRITE_ERROR 2014-03-09 01:58:48.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Skriv Fel

    Systemet returnerade: %E

    An error condition occurred while writing to the network. Please retry your request.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/sv/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/sv/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/sv/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:58:49.000000000 -0800 +++ squid-3.4.4.1/errors/sv/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FEL: Den begärda URL:en kunde inte hämtas

    ERROR

    The requested URL could not be retrieved

    Följande fel påträffades vid hämtning av URL: %U

    Storleken på svaret var lika med noll

    Squid tog inte emot något data för denna förfrågan.

    Din cacheserver administratör är %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ACCESS_DENIED squid-3.4.4.1/errors/th/ERR_ACCESS_DENIED --- squid-3.4.4/errors/th/ERR_ACCESS_DENIED 2014-03-09 01:58:49.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Access Denied.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:58:50.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/th/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/th/ERR_AGENT_CONFIGURE 2014-03-09 01:58:50.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_AGENT_WPAD squid-3.4.4.1/errors/th/ERR_AGENT_WPAD --- squid-3.4.4/errors/th/ERR_AGENT_WPAD 2014-03-09 01:58:51.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ERROR

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/th/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/th/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:58:52.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: การเรียกใช้ระบบแคชไม่ได้รับอนุญาต

    ERROR

    การเรียกใช้ระบบแคชไม่ได้รับอนุญาต

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Cache Access Denied.

    Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/th/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/th/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:58:52.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: การเรียกใช้ระบบจัดการแคชไม่ได้รับอนุญาต

    ERROR

    การเรียกใช้ระบบจัดการแคชไม่ได้รับอนุญาต

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Cache Manager Access Denied.

    Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

    Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/th/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/th/ERR_CANNOT_FORWARD 2014-03-09 01:58:53.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    ในขณะนี้ไม่สามารถส่งต่อ (forward) คำขอนี้

    This request could not be forwarded to the origin server or to any parent caches.

    ปัญหาที่เป็นไปได้อาจจะเป็น:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_CONFLICT_HOST squid-3.4.4.1/errors/th/ERR_CONFLICT_HOST --- squid-3.4.4/errors/th/ERR_CONFLICT_HOST 2014-03-09 01:58:53.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    ปัญหาที่เป็นไปได้อาจจะเป็น:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_CONNECT_FAIL squid-3.4.4.1/errors/th/ERR_CONNECT_FAIL --- squid-3.4.4/errors/th/ERR_CONNECT_FAIL 2014-03-09 01:58:54.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    การเชื่อมต่อไปยัง %I ไม่สำเร็จ

    ระบบส่งค่าคืนดังนี้: %E

    The remote host or network may be down. Please try the request again.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_DIR_LISTING squid-3.4.4.1/errors/th/ERR_DIR_LISTING --- squid-3.4.4/errors/th/ERR_DIR_LISTING 2014-03-09 01:58:54.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_DNS_FAIL squid-3.4.4.1/errors/th/ERR_DNS_FAIL --- squid-3.4.4/errors/th/ERR_DNS_FAIL 2014-03-09 01:58:55.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    ไม่สามารถระบุที่อยู่ไอพีจากชื่อเครื่อง %H

    เครื่องบริการ DNS ส่งค่ากลับมาดังนี้:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ESI squid-3.4.4.1/errors/th/ERR_ESI --- squid-3.4.4/errors/th/ERR_ESI 2014-03-09 01:58:55.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    การประมวลผล ESI ไม่สำเร็จ

    หน่วยประมวลผล ESI ส่งค่ากลับมาดังนี้:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    ผู้ดูแลเว็บของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/th/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/th/ERR_FORWARDING_DENIED 2014-03-09 01:58:56.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    การส่งต่อ (forwarding) ไม่ได้รับอนุญาต

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_DISABLED squid-3.4.4.1/errors/th/ERR_FTP_DISABLED --- squid-3.4.4/errors/th/ERR_FTP_DISABLED 2014-03-09 01:58:56.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    ไม่ได้เปิดให้เรียกใช้ FTP

    ระบบแคชนี้ไม่รองรับ FTP

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_FAILURE squid-3.4.4.1/errors/th/ERR_FTP_FAILURE --- squid-3.4.4/errors/th/ERR_FTP_FAILURE 2014-03-09 01:58:57.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    An FTP protocol error occurred while trying to retrieve the URL: %U

    squid ได้ส่งคำสั่ง FTP ดังต่อไปนี้:

    %f

    เครื่องให้บริการ (server) ตอบกลับดังนี้:

    %F
    %g

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/th/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/th/ERR_FTP_FORBIDDEN 2014-03-09 01:58:57.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    squid ได้ส่งคำสั่ง FTP ดังต่อไปนี้:

    %f

    เครื่องให้บริการ (server) ตอบกลับดังนี้:

    %F
    %g

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/th/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/th/ERR_FTP_NOT_FOUND 2014-03-09 01:58:58.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ไม่สามารถเรียกดู URL ต่อไปนี้ได้: %U

    squid ได้ส่งคำสั่ง FTP ดังต่อไปนี้:

    %f

    เครื่องให้บริการ (server) ตอบกลับดังนี้:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/th/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/th/ERR_FTP_PUT_CREATED 2014-03-09 01:58:58.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    ปฏิบัติการเสร็จสมบูรณ์

    ไฟล์ใหม่ถูกสร้างขึ้น


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/th/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/th/ERR_FTP_PUT_ERROR 2014-03-09 01:58:59.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ส่งไฟล์ขึ้น FTP ไม่สำเร็จ

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    squid ได้ส่งคำสั่ง FTP ดังต่อไปนี้:

    %f

    เครื่องให้บริการ (server) ตอบกลับดังนี้:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/th/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/th/ERR_FTP_PUT_MODIFIED 2014-03-09 01:58:59.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    ปฏิบัติการเสร็จสมบูรณ์

    ไฟล์ถูกแทนที่ด้วยไฟล์ใหม่


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/th/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/th/ERR_FTP_UNAVAILABLE 2014-03-09 01:59:00.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    เครื่องบริการ FTP ไม่ว่างพอที่จะตอบสนองหรือเรียกดู URL: %U

    squid ได้ส่งคำสั่ง FTP ดังต่อไปนี้:

    %f

    เครื่องให้บริการ (server) ตอบกลับดังนี้:

    %F
    %g

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/th/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/th/ERR_GATEWAY_FAILURE 2014-03-09 01:59:00.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ICAP_FAILURE squid-3.4.4.1/errors/th/ERR_ICAP_FAILURE --- squid-3.4.4/errors/th/ERR_ICAP_FAILURE 2014-03-09 01:59:01.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    เกิดความผิดพลาดในโปรโตคอล ICAP

    ระบบส่งค่าคืนดังนี้: %E

    This means that some aspect of the ICAP communication failed.

    ปัญหาที่เป็นไปได้อาจจะเป็น:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_INVALID_REQ squid-3.4.4.1/errors/th/ERR_INVALID_REQ --- squid-3.4.4/errors/th/ERR_INVALID_REQ 2014-03-09 01:59:01.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    Invalid Request error was encountered while trying to process the request:

    %R

    ปัญหาที่เป็นไปได้อาจจะเป็น:

    • ไม่ได้ระบุวิธีการหรือคำสั่ง หรือ ไม่รู้จักวิธีการหรือคำสั่งที่เรียกมา (request method)

    • ไม่ได้ระบุ URL

    • ไม่ได้ระบุชื่อตัวแแปร (identifier) ใน HTTP (HTTP/1.0)

    • คำสั่งหรือคำร้อง (request) ที่ส่ง มีขนาดใหญ่เกินไป

    • ไม่ได้ระบุ Content-Length ในการสั่ง POST หรือ PUT

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_INVALID_RESP squid-3.4.4.1/errors/th/ERR_INVALID_RESP --- squid-3.4.4/errors/th/ERR_INVALID_RESP 2014-03-09 01:59:02.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_INVALID_URL squid-3.4.4.1/errors/th/ERR_INVALID_URL --- squid-3.4.4/errors/th/ERR_INVALID_URL 2014-03-09 01:59:03.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    URL ผิดรูปแบบ (invalid)

    URL ที่ร้องขอ มีลักษณะบางอย่างไม่ถูกต้อง

    ปัญหาที่เป็นไปได้อาจจะเป็น:

    • ไม่ได้ระบุโปรโตคอล หรือ โปรโตคอลที่เรียกใช้ไม่ถูกต้อง (รูปแบบที่ถูกต้อง ควรจะเป็นในลักษณะ http:// เป็นต้น)

    • ไม่ได้ระบุชื่อเครื่อง

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_LIFETIME_EXP squid-3.4.4.1/errors/th/ERR_LIFETIME_EXP --- squid-3.4.4/errors/th/ERR_LIFETIME_EXP 2014-03-09 01:59:03.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Connection Lifetime Expired

    Squid has terminated the request because it has exceeded the maximum connection lifetime.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_NO_RELAY squid-3.4.4.1/errors/th/ERR_NO_RELAY --- squid-3.4.4/errors/th/ERR_NO_RELAY 2014-03-09 01:59:04.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/th/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/th/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:59:04.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/error-details.txt squid-3.4.4.1/errors/th/error-details.txt --- squid-3.4.4/errors/th/error-details.txt 2014-03-09 01:59:10.000000000 -0800 +++ squid-3.4.4.1/errors/th/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/th/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/th/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/th/ERR_PRECONDITION_FAILED 2014-03-09 01:59:05.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_READ_ERROR squid-3.4.4.1/errors/th/ERR_READ_ERROR --- squid-3.4.4/errors/th/ERR_READ_ERROR 2014-03-09 01:59:05.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    เกิดความผิดพลาดในการรับข้อมูล

    ระบบส่งค่าคืนดังนี้: %E

    An error condition occurred while reading data from the network. Please retry your request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_READ_TIMEOUT squid-3.4.4.1/errors/th/ERR_READ_TIMEOUT --- squid-3.4.4/errors/th/ERR_READ_TIMEOUT 2014-03-09 01:59:06.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    การรอรับข้อมูลเกินเวลาที่กำหนด

    ระบบส่งค่าคืนดังนี้: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/th/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/th/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:59:06.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    สร้างการเชื่อมต่อนิรภัย (secure connection) ไปยัง %I ไม่สำเร็จ

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/th/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/th/ERR_SHUTTING_DOWN 2014-03-09 01:59:07.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/th/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/th/ERR_SOCKET_FAILURE 2014-03-09 01:59:07.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    เกิดการล้มเหลวใน socket

    ระบบส่งค่าคืนดังนี้: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_TOO_BIG squid-3.4.4.1/errors/th/ERR_TOO_BIG --- squid-3.4.4/errors/th/ERR_TOO_BIG 2014-03-09 01:59:08.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    คำร้องขอหรือคำตอบกลับมีขนาดใหญ่เกินไป

    ถ้าคุณกำลังสั่ง POST หรือ PUT, ข้อมูลที่คุณกำลังส่งขึ้นไปนั้น มีขนาดใหญ่เกินไป

    ถ้าคุณกำลังสั่ง GET, ข้อมูลที่คุณกำลังส่งถ่ายเข้ามา (ดาวน์โหลด) นั้น มีขนาดใหญ่เกินไป

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/th/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/th/ERR_UNSUP_HTTPVERSION 2014-03-09 01:59:08.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่รองรับ HTTP รุ่นนี้

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    Unsupported HTTP version

    squid ไม่รับ HTTP รุ่นที่คุณพยายามเรียกใช้อยู่นี้

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_UNSUP_REQ squid-3.4.4.1/errors/th/ERR_UNSUP_REQ --- squid-3.4.4/errors/th/ERR_UNSUP_REQ 2014-03-09 01:59:09.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    ไม่รองรับโปรโตคอลและวิธีการหรือคำสั่งที่เรียกมา (request method)

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_URN_RESOLVE squid-3.4.4.1/errors/th/ERR_URN_RESOLVE --- squid-3.4.4/errors/th/ERR_URN_RESOLVE 2014-03-09 01:59:09.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: The requested URN could not be retrieved

    ERROR

    ไม่สามารถเรียกดู URL สำหรับ URN ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URN: %U

    Cannot Resolve URN

    เฮ้, อย่าคาดหวังจาก URN บน %T มากเกินไปนัก :)

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_WRITE_ERROR squid-3.4.4.1/errors/th/ERR_WRITE_ERROR --- squid-3.4.4/errors/th/ERR_WRITE_ERROR 2014-03-09 01:59:10.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    เกิดความผิดพลาดในการส่งข้อมูล

    ระบบส่งค่าคืนดังนี้: %E

    An error condition occurred while writing to the network. Please retry your request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/th/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/th/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/th/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:59:10.000000000 -0800 +++ squid-3.4.4.1/errors/th/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    ERROR

    ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ

    พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู URL: %U

    สิ่งที่ตอบกลับมา ว่างเปล่า

    Squid did not receive any data for this request.

    ผู้ดูแลระบบแคชของคุณคือ %w


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ACCESS_DENIED squid-3.4.4.1/errors/tr/ERR_ACCESS_DENIED --- squid-3.4.4/errors/tr/ERR_ACCESS_DENIED 2014-03-09 01:59:11.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Erişim Yasak.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:59:12.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/tr/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/tr/ERR_AGENT_CONFIGURE 2014-03-09 01:59:12.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    HATA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_AGENT_WPAD squid-3.4.4.1/errors/tr/ERR_AGENT_WPAD --- squid-3.4.4/errors/tr/ERR_AGENT_WPAD 2014-03-09 01:59:13.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    HATA

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/tr/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/tr/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:59:13.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: Cache Access Denied

    ERROR

    Cache Erişim Yasak.

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Cache Sunucusunu Kullanamazsınız.

    Özür dilerim, istediğiniz %U adresine bu Cache Sunucusunu kullanarak ulaşamazsınız.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:59:14.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: Cache Manager Access Denied

    ERROR

    Cache Manager Erişim Yasak.

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Cache Yönetici girişi yasak.

    Özür dilerim, istediğiniz %U adresine bu cache yönetici girişinden bağlanamazsınız.

    Eğer sorun devam ediyor ise lütfen cache yöneticisi ile bağlantıya geçin Eğer yönetici siz iseniz Squid Yardım Sayfalarında Cache Yöneticisi giriş arayüzü ile ilgili kısımları tekrar okuyun ve Cache sunucusunun hata mesajlarını kontrol edin.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/tr/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/tr/ERR_CANNOT_FORWARD 2014-03-09 01:59:14.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Şu anda sizi yönlendiremem.

    This request could not be forwarded to the origin server or to any parent caches.

    Buna sebep aşağidakilerden herhangi biri olabilir:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_CONFLICT_HOST squid-3.4.4.1/errors/tr/ERR_CONFLICT_HOST --- squid-3.4.4/errors/tr/ERR_CONFLICT_HOST 2014-03-09 01:59:15.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Buna sebep aşağidakilerden herhangi biri olabilir:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_CONNECT_FAIL squid-3.4.4.1/errors/tr/ERR_CONNECT_FAIL --- squid-3.4.4/errors/tr/ERR_CONNECT_FAIL 2014-03-09 01:59:15.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    %I 'a bağlantı başarısız.

    Sistemden gelen mesaj: %E

    The remote host or network may be down. Please try the request again.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_DIR_LISTING squid-3.4.4.1/errors/tr/ERR_DIR_LISTING --- squid-3.4.4/errors/tr/ERR_DIR_LISTING 2014-03-09 01:59:16.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Dizin: %U

    Dizin: %U/

    Dizin İçeriği

    %z
    %g
    Kaynak Dizin (Kök Dizin)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_DNS_FAIL squid-3.4.4.1/errors/tr/ERR_DNS_FAIL --- squid-3.4.4/errors/tr/ERR_DNS_FAIL 2014-03-09 01:59:16.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    %H isimli sunucuya ait herhangi bir IP adresi bulunamadı.

    DNS sunucusundan gelen cevap:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ESI squid-3.4.4.1/errors/tr/ERR_ESI --- squid-3.4.4/errors/tr/ERR_ESI 2014-03-09 01:59:17.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    ESI İşleminde hata.

    ESI işlemi geri döndü:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Senin webmaster'ın %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/tr/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/tr/ERR_FORWARDING_DENIED 2014-03-09 01:59:17.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Yönlendirme yasak.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_DISABLED squid-3.4.4.1/errors/tr/ERR_FTP_DISABLED --- squid-3.4.4/errors/tr/ERR_FTP_DISABLED 2014-03-09 01:59:18.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    FTP şu anda kapalı.

    Bu cache sunucu FTP desteklemiyor.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_FAILURE squid-3.4.4.1/errors/tr/ERR_FTP_FAILURE --- squid-3.4.4/errors/tr/ERR_FTP_FAILURE 2014-03-09 01:59:18.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL: %U adresine erişilirken bir iletişim hatası meydana geldi.

    Squid, şu FTP komutlarını gönderdi:

    %f

    Sunucu cevabı:

    %F
    %g

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/tr/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/tr/ERR_FTP_FORBIDDEN 2014-03-09 01:59:19.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL: %U adresine erişilirken bir FTP onay hatası meydana geldi.

    Squid, şu FTP komutlarını gönderdi:

    %f

    Sunucu cevabı:

    %F
    %g

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/tr/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/tr/ERR_FTP_NOT_FOUND 2014-03-09 01:59:19.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilemiyor: %U

    Squid, şu FTP komutlarını gönderdi:

    %f

    Sunucu cevabı:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/tr/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/tr/ERR_FTP_PUT_CREATED 2014-03-09 01:59:20.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    İşlem başarıyla tamamlandı

    Dosya güncellendi.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/tr/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/tr/ERR_FTP_PUT_ERROR 2014-03-09 01:59:21.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: FTP upload failed

    ERROR

    FTP PUT upload failed

    URL: %U adresine erişilirken bir iletişim hatası meydana geldi.

    Squid, şu FTP komutlarını gönderdi:

    %f

    Sunucu cevabı:

    %F

    FTP sunucusunun dosya saklamak için izni olmayabilir. Paketi,izinleri ve disk alanını kontrol edin ve tekrar deneyin.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/tr/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/tr/ERR_FTP_PUT_MODIFIED 2014-03-09 01:59:21.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    İşlem başarıyla tamamlandı

    Dosya güncellendi.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/tr/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/tr/ERR_FTP_UNAVAILABLE 2014-03-09 01:59:22.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    Erişmek istediğiniz URL: %U FTP sunucusu çok meşgul.

    Squid, şu FTP komutlarını gönderdi:

    %f

    Sunucu cevabı:

    %F
    %g

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/tr/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/tr/ERR_GATEWAY_FAILURE 2014-03-09 01:59:22.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ICAP_FAILURE squid-3.4.4.1/errors/tr/ERR_ICAP_FAILURE --- squid-3.4.4/errors/tr/ERR_ICAP_FAILURE 2014-03-09 01:59:23.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    ICAP iletişim hatası.

    Sistemden gelen mesaj: %E

    This means that some aspect of the ICAP communication failed.

    Buna sebep aşağidakilerden herhangi biri olabilir:

    • ICAP sunucusu erişilemez.

    • ICAP sunucusundan yasadışı bir yanıt alınmıştır.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_INVALID_REQ squid-3.4.4.1/errors/tr/ERR_INVALID_REQ --- squid-3.4.4/errors/tr/ERR_INVALID_REQ 2014-03-09 01:59:23.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    Geçersiz İstek İşlem sırasında bir hata ile karşılaşıldı:

    %R

    Buna sebep aşağidakilerden herhangi biri olabilir:

    • Eksik veya bilinmeyen metod (GET, POST).

    • Eksik URL.

    • Eksik HTTP Belirleyici (HTTP/1.0).

    • İstenilen dosya çok büyük.

    • Content-Length, POST veya PUT istekleri için eksik.

    • Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz).

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_INVALID_RESP squid-3.4.4.1/errors/tr/ERR_INVALID_RESP --- squid-3.4.4/errors/tr/ERR_INVALID_RESP 2014-03-09 01:59:24.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    Geçersiz Yanıt İşlem sırasında bir hata ile karşılaşıldı:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_INVALID_URL squid-3.4.4.1/errors/tr/ERR_INVALID_URL --- squid-3.4.4/errors/tr/ERR_INVALID_URL 2014-03-09 01:59:24.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Yanlış URL.

    Vermiş olduğunuz URL yanlış.

    Buna sebep aşağidakilerden herhangi biri olabilir:

    • Eksik veya yanlış protokol ismi (http:// veya benzeri olmalı).

    • Eksik adres.

    • Illegal double-escape in the URL-Path

    • Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz).

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_LIFETIME_EXP squid-3.4.4.1/errors/tr/ERR_LIFETIME_EXP --- squid-3.4.4/errors/tr/ERR_LIFETIME_EXP 2014-03-09 01:59:25.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Bağlantı süresi doldu.

    Squid, bağlantı süresi dolduğu için isteğinizi durdurdu.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_NO_RELAY squid-3.4.4.1/errors/tr/ERR_NO_RELAY --- squid-3.4.4/errors/tr/ERR_NO_RELAY 2014-03-09 01:59:25.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    WAIS Sunucu tanımlı değil

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/tr/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/tr/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:59:26.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    İstediğiniz doğru doküman cache sunucusunda bulunamadı ve only-if-cached (sadece Cache Sunucunda bulunuyor ise) tanımlı.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/error-details.txt squid-3.4.4.1/errors/tr/error-details.txt --- squid-3.4.4/errors/tr/error-details.txt 2014-03-09 01:59:32.000000000 -0800 +++ squid-3.4.4.1/errors/tr/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/tr/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/tr/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/tr/ERR_PRECONDITION_FAILED 2014-03-09 01:59:27.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_READ_ERROR squid-3.4.4.1/errors/tr/ERR_READ_ERROR --- squid-3.4.4/errors/tr/ERR_READ_ERROR 2014-03-09 01:59:27.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Okuma Hatası

    Sistemden gelen mesaj: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_READ_TIMEOUT squid-3.4.4.1/errors/tr/ERR_READ_TIMEOUT --- squid-3.4.4/errors/tr/ERR_READ_TIMEOUT 2014-03-09 01:59:28.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Okuma zamanı doldu (Read Timeout)

    Sistemden gelen mesaj: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/tr/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/tr/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:59:28.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    %I ile güvenli bağlantı kurma başarısız

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/tr/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/tr/ERR_SHUTTING_DOWN 2014-03-09 01:59:29.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/tr/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/tr/ERR_SOCKET_FAILURE 2014-03-09 01:59:29.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Bağlantı hatası (Socket Failure).

    Sistemden gelen mesaj: %E

    Squid, TCP bağlantı yaratamadı. Bunun nedeni hedef sunucunun çok fazla yüklenmiş olması olabilir. Lütfen isteğinizi tekrar giriniz.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_TOO_BIG squid-3.4.4.1/errors/tr/ERR_TOO_BIG --- squid-3.4.4/errors/tr/ERR_TOO_BIG 2014-03-09 01:59:30.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Talep veya cevap çok büyük.

    Bir POST veya PUT isteği yapıyorsanız yüklemeye çalıştığınız öğe çok büyük.

    Eğer GET isteği yapıyorsanız, indirmeye çalıştığınız dosya çok büyüktür.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/tr/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/tr/ERR_UNSUP_HTTPVERSION 2014-03-09 01:59:30.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    Desteklenmeyen HTTP versiyonu.

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Unsupported HTTP version

    Squid kullandığınız HTTP versiyonunu kabul etmiyor.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_UNSUP_REQ squid-3.4.4.1/errors/tr/ERR_UNSUP_REQ --- squid-3.4.4/errors/tr/ERR_UNSUP_REQ 2014-03-09 01:59:31.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Desteklenmeyen istek yöntemi ve protokol.

    Squid, bazı erişim protokollerin, bazı istek yöntemlerini desteklemiyor. Örneğin Gopher isteğinizde POST yapamazsınız.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_URN_RESOLVE squid-3.4.4.1/errors/tr/ERR_URN_RESOLVE --- squid-3.4.4/errors/tr/ERR_URN_RESOLVE 2014-03-09 01:59:31.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: The requested URN could not be retrieved

    ERROR

    URN'ye erişmek için bir URL alınamadı.

    URN: %U erişilirken bir hata ile karşılaşıldı.

    URN çözülemedi.

    %T de URN den fazla birsey beklemeyin. :)

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_WRITE_ERROR squid-3.4.4.1/errors/tr/ERR_WRITE_ERROR --- squid-3.4.4/errors/tr/ERR_WRITE_ERROR 2014-03-09 01:59:32.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Yazma Hatası

    Sistemden gelen mesaj: %E

    An error condition occurred while writing to the network. Please retry your request.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/tr/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/tr/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/tr/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:59:32.000000000 -0800 +++ squid-3.4.4.1/errors/tr/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - HATA: İstenilen URL'e ulaşılamadı

    ERROR

    The requested URL could not be retrieved

    URL adresine erişilmeye çalışıyorken hata meydana geldi: %U

    Sıfır Uzunlukta cevap

    Squid, isteğiniz ile ilgili herhangi bir bilgi alamadı.

    Önbellk yöneticiniz %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ACCESS_DENIED squid-3.4.4.1/errors/uk/ERR_ACCESS_DENIED --- squid-3.4.4/errors/uk/ERR_ACCESS_DENIED 2014-03-09 01:59:33.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Доступ заборонено

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:59:34.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/uk/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/uk/ERR_AGENT_CONFIGURE 2014-03-09 01:59:34.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ПОМИЛКА

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_AGENT_WPAD squid-3.4.4.1/errors/uk/ERR_AGENT_WPAD --- squid-3.4.4/errors/uk/ERR_AGENT_WPAD 2014-03-09 01:59:35.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ПОМИЛКА

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/uk/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/uk/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:59:35.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Cache Access Denied

    ERROR

    Cache Доступ заборонено

    При отриманні URL: %U виникла помилка.

    Доступ до кешу заборонено

    Вибачте, Вам зараз не дозволено запитувати %U з цього кешу. Спочатку авторизуйтеся.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:59:36.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Cache Manager Access Denied

    ERROR

    Cache Manager Доступ заборонено

    При отриманні URL: %U виникла помилка.

    Доступ до керування кешом заборонено

    Вибачте, Вам зараз не дозволено запитувати %U з цього менеджера кешу. Спочатку авторизуйтеся.

    Будь-ласка, зв'яжіться з Адміністратором кешу, якщо у Вас виникли труднощі з авторизацією, якщо Ви Адміністратор, читайте документацію стосовно інтерфейсу керування кешом. А також для отримання більш детальної інформації про помилки перегляньте лог-файл кешу.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/uk/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/uk/ERR_CANNOT_FORWARD 2014-03-09 01:59:36.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    В даний момент неможливо переслати даний запит

    This request could not be forwarded to the origin server or to any parent caches.

    Ймовірні причини:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_CONFLICT_HOST squid-3.4.4.1/errors/uk/ERR_CONFLICT_HOST --- squid-3.4.4/errors/uk/ERR_CONFLICT_HOST 2014-03-09 01:59:37.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Ймовірні причини:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_CONNECT_FAIL squid-3.4.4.1/errors/uk/ERR_CONNECT_FAIL --- squid-3.4.4/errors/uk/ERR_CONNECT_FAIL 2014-03-09 01:59:37.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    З'єднання з %I втрачено

    Система повідомляє: %E

    The remote host or network may be down. Please try the request again.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_DIR_LISTING squid-3.4.4.1/errors/uk/ERR_DIR_LISTING --- squid-3.4.4/errors/uk/ERR_DIR_LISTING 2014-03-09 01:59:38.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Директорія: %U

    Директорія: %U/

    Вміст директорії:

    %z
    %g
    Попередня директорія (Коренева директорія)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_DNS_FAIL squid-3.4.4.1/errors/uk/ERR_DNS_FAIL --- squid-3.4.4/errors/uk/ERR_DNS_FAIL 2014-03-09 01:59:38.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Неможливо визначити IP адресу вузла: %H

    DNS сервер повідомляє:

    %z

    Це означає, що кеш не зміг перетворити ім'я вузла в URL. Перевірте правильність написання адреси.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ESI squid-3.4.4.1/errors/uk/ERR_ESI --- squid-3.4.4/errors/uk/ERR_ESI 2014-03-09 01:59:39.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Збій опрацювання ESI інструкції

    ESI обробник повідомляє:

    %Z

    Це означає, що обробник не зміг опрацювати ESI шаблон. Будь-ласка, повідомте про цю помилку Вебмайстра.

    Вебмайстер %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/uk/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/uk/ERR_FORWARDING_DENIED 2014-03-09 01:59:39.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Пересилку заборонено

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_DISABLED squid-3.4.4.1/errors/uk/ERR_FTP_DISABLED --- squid-3.4.4/errors/uk/ERR_FTP_DISABLED 2014-03-09 01:59:40.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    FTP відключено

    FTP відключено

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_FAILURE squid-3.4.4.1/errors/uk/ERR_FTP_FAILURE --- squid-3.4.4/errors/uk/ERR_FTP_FAILURE 2014-03-09 01:59:40.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка протоколу FTP.

    Squid надіслав наступну FTP команду:

    %f

    Сервер відповів наступне:

    %F
    %g

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/uk/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/uk/ERR_FTP_FORBIDDEN 2014-03-09 01:59:41.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U відбулася невдала FTP авторизація.

    Squid надіслав наступну FTP команду:

    %f

    Сервер відповів наступне:

    %F
    %g

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/uk/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/uk/ERR_FTP_NOT_FOUND 2014-03-09 01:59:42.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    Наступний URL: %U не може бути отриманий.

    Squid надіслав наступну FTP команду:

    %f

    Сервер відповів наступне:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/uk/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/uk/ERR_FTP_PUT_CREATED 2014-03-09 01:59:42.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Операцію успішно виконано

    Файл створено


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/uk/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/uk/ERR_FTP_PUT_ERROR 2014-03-09 01:59:43.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: FTP upload failed

    ERROR

    FTP PUT upload failed

    При отриманні URL: %U виникла помилка протоколу FTP.

    Squid надіслав наступну FTP команду:

    %f

    Сервер відповів наступне:

    %F

    Можливо на FTP сервері відсутній дозвіл або простір для зберігання файлу. Перевірте шлях, дозволи, вільний простір і спробуйте знов.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/uk/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/uk/ERR_FTP_PUT_MODIFIED 2014-03-09 01:59:43.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Операцію успішно виконано

    Файл поновлено


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/uk/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/uk/ERR_FTP_UNAVAILABLE 2014-03-09 01:59:44.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    Сервер FTP був дуже завантажений при отриманні URL: %U.

    Squid надіслав наступну FTP команду:

    %f

    Сервер відповів наступне:

    %F
    %g

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/uk/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/uk/ERR_GATEWAY_FAILURE 2014-03-09 01:59:44.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ICAP_FAILURE squid-3.4.4.1/errors/uk/ERR_ICAP_FAILURE --- squid-3.4.4/errors/uk/ERR_ICAP_FAILURE 2014-03-09 01:59:45.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Помилка протоколу ICAP

    Система повідомляє: %E

    Це означає, що деякі елементи ICAP з'єднання несправні.

    Ймовірні причини:

    • Сервер ICAP не досяжний;

    • Отримано некоректну відповідь від сервера ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_INVALID_REQ squid-3.4.4.1/errors/uk/ERR_INVALID_REQ --- squid-3.4.4/errors/uk/ERR_INVALID_REQ 2014-03-09 01:59:45.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    Невірний запит виник при обробці запиту:

    %R

    Ймовірні причини:

    • Відсутній або невідомий метод запиту

    • Відсутній URL

    • Відсутній HTTP ідентифікатор (HTTP/1.0)

    • Запит завеликий

    • Заголовок Content-Length відсутній для запитів POST чи PUT

    • Неприпустимий символ в імені сервера; символ підкреслення заборонено.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_INVALID_RESP squid-3.4.4.1/errors/uk/ERR_INVALID_RESP --- squid-3.4.4/errors/uk/ERR_INVALID_RESP 2014-03-09 01:59:46.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    Невірна відповідь виникла при обробці запиту:

    %R

    Отримана відповідь від HTTP сервера є незрозумілою або погано сформованою. Будь-ласка, зв'яжіться з оператором сайту.

    При необхідності, Адміністратор вашого кешу може забезпечити Вас більш детальною інформацією щодо ймовірних причин проблеми.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_INVALID_URL squid-3.4.4.1/errors/uk/ERR_INVALID_URL --- squid-3.4.4/errors/uk/ERR_INVALID_URL 2014-03-09 01:59:46.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Недійсний URL

    Деякі елементи запитуємого URL неправильні.

    Ймовірні причини:

    • Протокол доступу відсутній або неправильний (повинен бути http:// або схожий)

    • Відсутнє ім'я вузла

    • Illegal double-escape in the URL-Path

    • Неприпустимий символ в імені сервера; символ підкреслення заборонено.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_LIFETIME_EXP squid-3.4.4.1/errors/uk/ERR_LIFETIME_EXP --- squid-3.4.4/errors/uk/ERR_LIFETIME_EXP 2014-03-09 01:59:47.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Час життя з'єднання вийшов

    Squid завершив запит через перевищення максимального часу з'єднання.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_NO_RELAY squid-3.4.4.1/errors/uk/ERR_NO_RELAY --- squid-3.4.4/errors/uk/ERR_NO_RELAY 2014-03-09 01:59:47.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Не визначено WAIS Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/uk/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/uk/ERR_ONLY_IF_CACHED_MISS 2014-03-09 01:59:48.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/error-details.txt squid-3.4.4.1/errors/uk/error-details.txt --- squid-3.4.4/errors/uk/error-details.txt 2014-03-09 01:59:55.000000000 -0800 +++ squid-3.4.4.1/errors/uk/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/uk/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/uk/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/uk/ERR_PRECONDITION_FAILED 2014-03-09 01:59:49.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_READ_ERROR squid-3.4.4.1/errors/uk/ERR_READ_ERROR --- squid-3.4.4/errors/uk/ERR_READ_ERROR 2014-03-09 01:59:49.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Помилка читання

    Система повідомляє: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_READ_TIMEOUT squid-3.4.4.1/errors/uk/ERR_READ_TIMEOUT --- squid-3.4.4/errors/uk/ERR_READ_TIMEOUT 2014-03-09 01:59:50.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Час очікування на відповідь вийшов

    Система повідомляє: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/uk/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/uk/ERR_SECURE_CONNECT_FAIL 2014-03-09 01:59:50.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Невдалося встановити безпечне з'єднання з %I

    The system returned:

    %E (TLS code: %x)

    %D

    При обробці Вашого запиту даний кеш і віддалений вузел не змогли підібрати взаємовигідні параметри безпеки. Можливо віддалений вузел не підтримує безпечні з'єднання, або кеш не задоволений сертифікатом безпечності вузла.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/uk/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/uk/ERR_SHUTTING_DOWN 2014-03-09 01:59:51.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/uk/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/uk/ERR_SOCKET_FAILURE 2014-03-09 01:59:51.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Помилка TCP сокету

    Система повідомляє: %E

    Squid не зміг створити TCP сокет, скоріш за все через надмірне навантаження. Будь-ласка, повторіть запит.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_TOO_BIG squid-3.4.4.1/errors/uk/ERR_TOO_BIG --- squid-3.4.4/errors/uk/ERR_TOO_BIG 2014-03-09 01:59:52.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Запит або відповідь завеликі

    Якщо Ви здійснюєте POST чи PUT запит, тоді інформація яку ви завантажуєте - завелика.

    Якщо ви здійснюєте GET запит, тоді інформація яку ви скачуєте - завелика.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/uk/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/uk/ERR_UNSUP_HTTPVERSION 2014-03-09 01:59:53.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    Версія HTTP протоколу не підпримується

    При отриманні URL: %U виникла помилка.

    Unsupported HTTP version

    Squid не сприймає версію HTTP яку Ви намагаєтесь використовувати.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_UNSUP_REQ squid-3.4.4.1/errors/uk/ERR_UNSUP_REQ --- squid-3.4.4/errors/uk/ERR_UNSUP_REQ 2014-03-09 01:59:53.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Метод запиту чи протокол не підтримуються

    Squid не підтримує всі методи запитів для всіх наявних протоколів. Як приклад, Ви не можете виконати запит POST для протоколу Gopher.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_URN_RESOLVE squid-3.4.4.1/errors/uk/ERR_URN_RESOLVE --- squid-3.4.4/errors/uk/ERR_URN_RESOLVE 2014-03-09 01:59:54.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: The requested URN could not be retrieved

    ERROR

    URL для запитуваного URN не може бути отриманий

    При отриманні URN: %U виникла помилка.

    Неможливо визначити URN

    Hey, don't expect too much from URNs on %T :)

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_WRITE_ERROR squid-3.4.4.1/errors/uk/ERR_WRITE_ERROR --- squid-3.4.4/errors/uk/ERR_WRITE_ERROR 2014-03-09 01:59:54.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Помилка запису

    Система повідомляє: %E

    An error condition occurred while writing to the network. Please retry your request.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uk/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/uk/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/uk/ERR_ZERO_SIZE_OBJECT 2014-03-09 01:59:55.000000000 -0800 +++ squid-3.4.4.1/errors/uk/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ПОМИЛКА: Запитаний URL не може бути отриманий.

    ERROR

    The requested URL could not be retrieved

    При отриманні URL: %U виникла помилка.

    Відповідь нульової довжини

    Squid не отримав жодних даних для цього запиту.

    Адміністратор даного кешу %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ACCESS_DENIED squid-3.4.4.1/errors/uz/ERR_ACCESS_DENIED --- squid-3.4.4/errors/uz/ERR_ACCESS_DENIED 2014-03-09 01:59:55.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Рухсат берилмаган.

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 01:59:56.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/uz/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/uz/ERR_AGENT_CONFIGURE 2014-03-09 01:59:56.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ХАТО

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_AGENT_WPAD squid-3.4.4.1/errors/uz/ERR_AGENT_WPAD --- squid-3.4.4/errors/uz/ERR_AGENT_WPAD 2014-03-09 01:59:57.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    ХАТО

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/uz/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/uz/ERR_CACHE_ACCESS_DENIED 2014-03-09 01:59:58.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Cache Access Denied

    ERROR

    Cache Рухсат берилмаган.

    The following error was encountered while trying to retrieve the URL: %U

    Cache Access Denied.

    Кечирасиз, сизнинг %U сўровингизга ушбу кеш томонидан тасдиқдан ўтмагунингизча рухсат берилмайди.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 01:59:58.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Cache Manager Access Denied

    ERROR

    Cache Manager Рухсат берилмаган.

    The following error was encountered while trying to retrieve the URL: %U

    Кеш бошқарувчиси рухсат бермади.

    Кечирасиз, сизнинг %U сўровингизга ушбу кеш бошқарувчи томонидан тасдиқдан ўтмагунингизча рухсат берилмайди.

    Агарда тасдиқдан ўтишда қийналаётган бўлсангиз кеш администратори билан боғланинг. Агарда сиз администратор бўлсангиз, Squid кеш бошқарувчи интерфейсидаги қўлланмаларни ўқинг ва кеш журналидаги хато хабарларини батафсил текшириб кўринг.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/uz/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/uz/ERR_CANNOT_FORWARD 2014-03-09 01:59:59.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Баъзи бўлиши мумкин бўлган муаммолар:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_CONFLICT_HOST squid-3.4.4.1/errors/uz/ERR_CONFLICT_HOST --- squid-3.4.4/errors/uz/ERR_CONFLICT_HOST 2014-03-09 01:59:59.000000000 -0800 +++ squid-3.4.4.1/errors/uz/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Баъзи бўлиши мумкин бўлган муаммолар:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_CONNECT_FAIL squid-3.4.4.1/errors/uz/ERR_CONNECT_FAIL --- squid-3.4.4/errors/uz/ERR_CONNECT_FAIL 2014-03-09 03:00:00.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    %Iга уланиш муваффақиятсиз якунланди.

    Тизим қайтарди: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_DIR_LISTING squid-3.4.4.1/errors/uz/ERR_DIR_LISTING --- squid-3.4.4/errors/uz/ERR_DIR_LISTING 2014-03-09 03:00:01.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Директория: %U

    Directory: %U/

    Директория таркиби:

    %z
    %g
    Асосий директория (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_DNS_FAIL squid-3.4.4.1/errors/uz/ERR_DNS_FAIL --- squid-3.4.4/errors/uz/ERR_DNS_FAIL 2014-03-09 03:00:01.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    DNS сервер қайтарди:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ESI squid-3.4.4.1/errors/uz/ERR_ESI --- squid-3.4.4/errors/uz/ERR_ESI 2014-03-09 03:00:02.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI жараёни муваффақиятсиз якунланди.

    ESI процессор қайтарди:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/uz/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/uz/ERR_FORWARDING_DENIED 2014-03-09 03:00:03.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Узатиш рад қилинди.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_DISABLED squid-3.4.4.1/errors/uz/ERR_FTP_DISABLED --- squid-3.4.4/errors/uz/ERR_FTP_DISABLED 2014-03-09 03:00:03.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    FTP ўчирилган

    Ушбу кеш FTP'ни қўллаб-қувватлай олмайди.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_FAILURE squid-3.4.4.1/errors/uz/ERR_FTP_FAILURE --- squid-3.4.4/errors/uz/ERR_FTP_FAILURE 2014-03-09 03:00:04.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid қуйидаги FTP буйруғини жўнатди:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/uz/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/uz/ERR_FTP_FORBIDDEN 2014-03-09 03:00:04.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid қуйидаги FTP буйруғини жўнатди:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/uz/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/uz/ERR_FTP_NOT_FOUND 2014-03-09 03:00:05.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid қуйидаги FTP буйруғини жўнатди:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/uz/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/uz/ERR_FTP_PUT_CREATED 2014-03-09 03:00:06.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Операция муваффақиятли

    Файл яратилди


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/uz/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/uz/ERR_FTP_PUT_ERROR 2014-03-09 03:00:06.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: FTP upload failed

    ERROR

    FTP PUT upload failed

    An FTP protocol error occurred while trying to retrieve the URL: %U

    Squid қуйидаги FTP буйруғини жўнатди:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/uz/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/uz/ERR_FTP_PUT_MODIFIED 2014-03-09 03:00:07.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Операция муваффақиятли

    Файл янгиланди


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/uz/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/uz/ERR_FTP_UNAVAILABLE 2014-03-09 03:00:08.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    FTP URL: %Uни етказиб бериш учун жуда банд.

    Squid қуйидаги FTP буйруғини жўнатди:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/uz/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/uz/ERR_GATEWAY_FAILURE 2014-03-09 03:00:08.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ICAP_FAILURE squid-3.4.4.1/errors/uz/ERR_ICAP_FAILURE --- squid-3.4.4/errors/uz/ERR_ICAP_FAILURE 2014-03-09 03:00:09.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP протоколда хатолик.

    Тизим қайтарди: %E

    This means that some aspect of the ICAP communication failed.

    Баъзи бўлиши мумкин бўлган муаммолар:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_INVALID_REQ squid-3.4.4.1/errors/uz/ERR_INVALID_REQ --- squid-3.4.4/errors/uz/ERR_INVALID_REQ 2014-03-09 03:00:09.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    Яроқсиз Сўров сўров бажарилаётган вақтда хатолик яратилди:

    %R

    Баъзи бўлиши мумкин бўлган муаммолар:

    • Йўқолган ёки номаълум сўраш методи

    • Missing URL.

    • Missing HTTP Identifier (HTTP/1.0).

    • Сўров жуда катта.

    • Content-Length missing for POST or PUT requests.

    • Illegal character in hostname; underscores are not allowed.

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_INVALID_RESP squid-3.4.4.1/errors/uz/ERR_INVALID_RESP --- squid-3.4.4/errors/uz/ERR_INVALID_RESP 2014-03-09 03:00:10.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    Яроқсиз жавоб хатолик сўров жараёнида яратилди :

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_INVALID_URL squid-3.4.4.1/errors/uz/ERR_INVALID_URL --- squid-3.4.4/errors/uz/ERR_INVALID_URL 2014-03-09 03:00:10.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Яроқсиз URL

    Баъзи сўралган URL'лар хато.

    Баъзи бўлиши мумкин бўлган муаммолар:

    • Йўқолган ёки хато рухсат бериш протоколи (http:// бўлиши керак ёки шунга ўхшаш)

    • Йўқолган ҳост номи

    • Illegal double-escape in the URL-Path

    • Illegal character in hostname; underscores are not allowed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_LIFETIME_EXP squid-3.4.4.1/errors/uz/ERR_LIFETIME_EXP --- squid-3.4.4/errors/uz/ERR_LIFETIME_EXP 2014-03-09 03:00:11.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Уланиш вақти ўтиб кетди

    Squid сўровингизни бекор қилди, чунки энг юқори уланиш жараёни кетмоқда.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_NO_RELAY squid-3.4.4.1/errors/uz/ERR_NO_RELAY --- squid-3.4.4/errors/uz/ERR_NO_RELAY 2014-03-09 03:00:12.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    No Wais Relay

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/uz/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/uz/ERR_ONLY_IF_CACHED_MISS 2014-03-09 03:00:12.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/error-details.txt squid-3.4.4.1/errors/uz/error-details.txt --- squid-3.4.4/errors/uz/error-details.txt 2014-03-09 03:00:19.000000000 -0700 +++ squid-3.4.4.1/errors/uz/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/uz/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/uz/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/uz/ERR_PRECONDITION_FAILED 2014-03-09 03:00:13.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_READ_ERROR squid-3.4.4.1/errors/uz/ERR_READ_ERROR --- squid-3.4.4/errors/uz/ERR_READ_ERROR 2014-03-09 03:00:13.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Ўқишда хато

    Тизим қайтарди: %E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_READ_TIMEOUT squid-3.4.4.1/errors/uz/ERR_READ_TIMEOUT --- squid-3.4.4/errors/uz/ERR_READ_TIMEOUT 2014-03-09 03:00:14.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Узилишни ўқиш

    Тизим қайтарди: %E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/uz/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/uz/ERR_SECURE_CONNECT_FAIL 2014-03-09 03:00:15.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    %I'га хавфсизлик уланиш ўрнатиш муваффақиятсиз якунланди

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/uz/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/uz/ERR_SHUTTING_DOWN 2014-03-09 03:00:15.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/uz/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/uz/ERR_SOCKET_FAILURE 2014-03-09 03:00:16.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Сокет яроқсиз

    Тизим қайтарди: %E

    Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_TOO_BIG squid-3.4.4.1/errors/uz/ERR_TOO_BIG --- squid-3.4.4/errors/uz/ERR_TOO_BIG 2014-03-09 03:00:16.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    Агарда сиз

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/uz/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/uz/ERR_UNSUP_HTTPVERSION 2014-03-09 03:00:17.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    Ушбу Squid версияси сиз ишлатмоқчи бўлаётган HTTP версияси билан мос келмайди.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_UNSUP_REQ squid-3.4.4.1/errors/uz/ERR_UNSUP_REQ --- squid-3.4.4/errors/uz/ERR_UNSUP_REQ 2014-03-09 03:00:17.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported Request Method and Protocol

    Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_URN_RESOLVE squid-3.4.4.1/errors/uz/ERR_URN_RESOLVE --- squid-3.4.4/errors/uz/ERR_URN_RESOLVE 2014-03-09 03:00:18.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: The requested URN could not be retrieved

    ERROR

    Сўралган URN учун URL топилмади

    The following error was encountered while trying to retrieve the URN: %U

    Cannot Resolve URN

    Эй, %T'даги URN'лардан кўп кутманг :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_WRITE_ERROR squid-3.4.4.1/errors/uz/ERR_WRITE_ERROR --- squid-3.4.4/errors/uz/ERR_WRITE_ERROR 2014-03-09 03:00:18.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Write Error

    Тизим қайтарди: %E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/uz/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/uz/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/uz/ERR_ZERO_SIZE_OBJECT 2014-03-09 03:00:19.000000000 -0700 +++ squid-3.4.4.1/errors/uz/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - ХАТО: Сўралган URL топилмади

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid ушбу сўров учун ҳеч қандай маълумот топа олмади

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ACCESS_DENIED squid-3.4.4.1/errors/vi/ERR_ACCESS_DENIED --- squid-3.4.4/errors/vi/ERR_ACCESS_DENIED 2014-03-09 03:00:20.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Truy cập bị từ chối.

    Cấu hình điều khiển truy cập không cho phép bạn yêu cầu vào lúc này. Hãy liên lạc với nhà cung cấp dịch vụ nếu bạn thấy rằng trường hợp này không đúng.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 03:00:20.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/vi/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/vi/ERR_AGENT_CONFIGURE 2014-03-09 03:00:21.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    LỖI

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    Cách tìm thiết lập này trong trình duyệt:

    Đối với trình duyệt Firefox thì thăm:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    Đối với trình duyệt Internet Explorer (IE) thì thăm:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    Đối với trình duyệt Opera thì thăm:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_AGENT_WPAD squid-3.4.4.1/errors/vi/ERR_AGENT_WPAD --- squid-3.4.4/errors/vi/ERR_AGENT_WPAD 2014-03-09 03:00:21.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    LỖI

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    Cách tìm thiết lập này trong trình duyệt:

    Đối với trình duyệt Firefox thì thăm:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    Đối với trình duyệt Internet Explorer (IE) thì thăm:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Bật tùy chọn Tự động phát hiện thiết lập
    Đối với trình duyệt Opera thì thăm:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Bật tùy chọn Dùng tự động cấu hình ủy nhiệm

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/vi/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/vi/ERR_CACHE_ACCESS_DENIED 2014-03-09 03:00:22.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: Cache Access Denied

    ERROR

    Cache Truy cập bị từ chối.

    The following error was encountered while trying to retrieve the URL: %U

    Truy cập đến vùng nhớ tạm bị từ chối.

    Để yêu cầu %U từ vùng nhớ tạm này thì trước tiên bạn cần phải tự xác thực.

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 03:00:22.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: Cache Manager Access Denied

    ERROR

    Cache Manager Truy cập bị từ chối.

    The following error was encountered while trying to retrieve the URL: %U

    Truy cập đến trình quản lý vùng nhớ tạm bị từ chối.

    Để yêu cầu %U từ trình quản lý vùng nhớ tạm này thì trước tiên bạn cần phải tự xác thực.

    Hãy liên lạc với quản trị vùng nhớ tạm nếu bạn gặp khó khăn trong việc tự xác thực, hoặc nếu bạn có phải là quản trị thì đọc tài liệu hướng dẫn Squid về giao diện quản lý vùng nhớ tạm và kiểm tra lại sổ theo dõi vùng nhớ tạm có thông điệp lỗi chi tiết hơn không.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/vi/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/vi/ERR_CANNOT_FORWARD 2014-03-09 03:00:23.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to forward this request at this time.

    This request could not be forwarded to the origin server or to any parent caches.

    Một số vấn đề có thể gặp:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_CONFLICT_HOST squid-3.4.4.1/errors/vi/ERR_CONFLICT_HOST --- squid-3.4.4/errors/vi/ERR_CONFLICT_HOST 2014-03-09 03:00:23.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Một số vấn đề có thể gặp:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_CONNECT_FAIL squid-3.4.4.1/errors/vi/ERR_CONNECT_FAIL --- squid-3.4.4/errors/vi/ERR_CONNECT_FAIL 2014-03-09 03:00:24.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Kết nối đến %I bị lỗi.

    The system returned: %E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_DIR_LISTING squid-3.4.4.1/errors/vi/ERR_DIR_LISTING --- squid-3.4.4/errors/vi/ERR_DIR_LISTING 2014-03-09 03:00:25.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Thư mục: %U

    Thư mục: %U/

    Nội dung thư mục:

    %z
    %g
    Thư mục cấp trên (Thư mục gốc)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_DNS_FAIL squid-3.4.4.1/errors/vi/ERR_DNS_FAIL --- squid-3.4.4/errors/vi/ERR_DNS_FAIL 2014-03-09 03:00:25.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unable to determine IP address from host name %H

    Máy phục vụ DNS trả lại:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ESI squid-3.4.4.1/errors/vi/ERR_ESI --- squid-3.4.4/errors/vi/ERR_ESI 2014-03-09 03:00:26.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lỗi xử lý ESI.

    Bộ xử lý ESI trả lại:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/vi/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/vi/ERR_FORWARDING_DENIED 2014-03-09 03:00:26.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Chuyển tiếp bị từ chối.

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_DISABLED squid-3.4.4.1/errors/vi/ERR_FTP_DISABLED --- squid-3.4.4/errors/vi/ERR_FTP_DISABLED 2014-03-09 03:00:27.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Chức năng FTP bị tắt

    This cache does not support FTP.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_FAILURE squid-3.4.4.1/errors/vi/ERR_FTP_FAILURE --- squid-3.4.4/errors/vi/ERR_FTP_FAILURE 2014-03-09 03:00:27.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Gặp lỗi giao thức FTP trong khi thử lấy địa chỉ URL: %U

    Squid đã gửi lệnh FTP theo đây:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/vi/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/vi/ERR_FTP_FORBIDDEN 2014-03-09 03:00:28.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Gặp lỗi xác thực FTP trong khi thử lấy địa chỉ URL: %U

    Squid đã gửi lệnh FTP theo đây:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/vi/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/vi/ERR_FTP_NOT_FOUND 2014-03-09 03:00:29.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid đã gửi lệnh FTP theo đây:

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/vi/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/vi/ERR_FTP_PUT_CREATED 2014-03-09 03:00:29.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Thao tác thành công

    Tập tin đã được tạo


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/vi/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/vi/ERR_FTP_PUT_ERROR 2014-03-09 03:00:30.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: FTP upload failed

    ERROR

    FTP PUT upload failed

    Gặp lỗi giao thức FTP trong khi thử lấy địa chỉ URL: %U

    Squid đã gửi lệnh FTP theo đây:

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/vi/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/vi/ERR_FTP_PUT_MODIFIED 2014-03-09 03:00:30.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    Thao tác thành công

    Tập tin đã được cập nhật


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/vi/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/vi/ERR_FTP_UNAVAILABLE 2014-03-09 03:00:31.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Máy phục vụ FTP quá bận để lấy địa chỉ URL: %U

    Squid đã gửi lệnh FTP theo đây:

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/vi/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/vi/ERR_GATEWAY_FAILURE 2014-03-09 03:00:31.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ICAP_FAILURE squid-3.4.4.1/errors/vi/ERR_ICAP_FAILURE --- squid-3.4.4/errors/vi/ERR_ICAP_FAILURE 2014-03-09 03:00:32.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lỗi giao thức ICAP.

    The system returned: %E

    This means that some aspect of the ICAP communication failed.

    Một số vấn đề có thể gặp:

    • The ICAP server is not reachable.

    • Nhận được một đáp ứng cấm từ máy phục vụ ICAP.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_INVALID_REQ squid-3.4.4.1/errors/vi/ERR_INVALID_REQ --- squid-3.4.4/errors/vi/ERR_INVALID_REQ 2014-03-09 03:00:32.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Gặp một lỗi Sai Yêu Cầu trong khi thử xử lý yêu cầu :

    %R

    Một số vấn đề có thể gặp:

    • Phương pháp truy cập còn thiếu hay không rõ.

    • URL còn thiếu.

    • Thiếu dấu nhận diện HTTP (HTTP/1.0).

    • Yêu cầu quá lớn.

    • Dòng đầu chiều dài nội dung (Content-Length) bị thiếu trong yêu cầu POST hay PUT.

    • Gặp ký tự cấm trong tên máy: không cho phép dùng dấu gạch dưới.

    • HTTP/1.1 Mong đợi: tính năng được yêu cầu từ phần mềm HTTP/1.0.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_INVALID_RESP squid-3.4.4.1/errors/vi/ERR_INVALID_RESP --- squid-3.4.4/errors/vi/ERR_INVALID_RESP 2014-03-09 03:00:33.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    Gặp một lỗi Sai Đáp Ứng trong khi thử xử lý yêu cầu :

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_INVALID_URL squid-3.4.4.1/errors/vi/ERR_INVALID_URL --- squid-3.4.4/errors/vi/ERR_INVALID_URL 2014-03-09 03:00:33.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URL sai

    Địa chỉ URL yêu cầu có một phần không đúng.

    Một số vấn đề có thể gặp:

    • Giao thức truy cập còn thiếu hay sai (nên là http:// hay tương tự)

    • Tên máy còn thiếu

    • Gặp ký tự thoát đôi cấm trong đường dẫn URL

    • Gặp ký tự cấm trong tên máy: không cho phép dùng dấu gạch dưới.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_LIFETIME_EXP squid-3.4.4.1/errors/vi/ERR_LIFETIME_EXP --- squid-3.4.4/errors/vi/ERR_LIFETIME_EXP 2014-03-09 03:00:34.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Quá hạn kết nối

    Squid đã chấm dứt yêu cầu vì nó vượt quá thời gian kết nối tối đa.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_NO_RELAY squid-3.4.4.1/errors/vi/ERR_NO_RELAY --- squid-3.4.4/errors/vi/ERR_NO_RELAY 2014-03-09 03:00:34.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Không có bộ tiếp lại WAIS

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/vi/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/vi/ERR_ONLY_IF_CACHED_MISS 2014-03-09 03:00:35.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Valid document was not found in the cache and only-if-cached directive was specified.

    You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/error-details.txt squid-3.4.4.1/errors/vi/error-details.txt --- squid-3.4.4/errors/vi/error-details.txt 2014-03-09 03:00:42.000000000 -0700 +++ squid-3.4.4.1/errors/vi/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/vi/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/vi/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/vi/ERR_PRECONDITION_FAILED 2014-03-09 03:00:36.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_READ_ERROR squid-3.4.4.1/errors/vi/ERR_READ_ERROR --- squid-3.4.4/errors/vi/ERR_READ_ERROR 2014-03-09 03:00:36.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lỗi đọc

    The system returned: %E

    Gặp lỗi trong khi đọc dữ liệu từ mạng. Hãy thử lại gửi yêu cầu.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_READ_TIMEOUT squid-3.4.4.1/errors/vi/ERR_READ_TIMEOUT --- squid-3.4.4/errors/vi/ERR_READ_TIMEOUT 2014-03-09 03:00:37.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Quá hạn đọc

    The system returned: %E

    Quá hạn trong khi đợi đọc dữ liệu từ mạng. Có thể là mạng không chạy được hoặc bị tắc nghẽn. Hãy thử lại gửi yêu cầu.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/vi/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/vi/ERR_SECURE_CONNECT_FAIL 2014-03-09 03:00:37.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Không thiết lập được một kết nối bảo mật đến %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/vi/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/vi/ERR_SHUTTING_DOWN 2014-03-09 03:00:38.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/vi/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/vi/ERR_SOCKET_FAILURE 2014-03-09 03:00:38.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Lỗi ổ cắm

    The system returned: %E

    Squid không thể tạo một ổ cắm TCP, giả sử do trọng tải quá lớn. Hãy thử lại gửi yêu cầu.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_TOO_BIG squid-3.4.4.1/errors/vi/ERR_TOO_BIG --- squid-3.4.4/errors/vi/ERR_TOO_BIG 2014-03-09 03:00:39.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    Gửi một yêu cầu POST (gửi) hay PUT (để) thì bạn đang thử tải lên một mục quá lớn.

    Gửi một yêu cầu GET (lấy) thì bạn đang thử tải về một mục quá lớn.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/vi/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/vi/ERR_UNSUP_HTTPVERSION 2014-03-09 03:00:40.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_UNSUP_REQ squid-3.4.4.1/errors/vi/ERR_UNSUP_REQ --- squid-3.4.4/errors/vi/ERR_UNSUP_REQ 2014-03-09 03:00:40.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported Request Method and Protocol

    Squid không hỗ trợ tất cả các phương pháp yêu cầu cho mỗi giao thức truy cập. Chẳng hạn, bạn không có khả năng POST một yêu cầu Gopher.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_URN_RESOLVE squid-3.4.4.1/errors/vi/ERR_URN_RESOLVE --- squid-3.4.4/errors/vi/ERR_URN_RESOLVE 2014-03-09 03:00:41.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URN could not be retrieved

    ERROR

    Không thể lấy được một địa chỉ URL cho URN yêu cầu

    The following error was encountered while trying to retrieve the URN: %U

    Không tìm thấy URN

    URN trên %T không có nhiều khả năng.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_WRITE_ERROR squid-3.4.4.1/errors/vi/ERR_WRITE_ERROR --- squid-3.4.4/errors/vi/ERR_WRITE_ERROR 2014-03-09 03:00:42.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Write Error

    The system returned: %E

    Gặp lỗi trong khi ghi vào mạng. Hãy thử lại gửi yêu cầu.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/vi/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/vi/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/vi/ERR_ZERO_SIZE_OBJECT 2014-03-09 03:00:42.000000000 -0700 +++ squid-3.4.4.1/errors/vi/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - LỖI: The requested URL could not be retrieved

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Zero Sized Reply

    Squid chưa nhận dữ liệu cho yêu cầu này.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ACCESS_DENIED squid-3.4.4.1/errors/zh-cn/ERR_ACCESS_DENIED --- squid-3.4.4/errors/zh-cn/ERR_ACCESS_DENIED 2014-03-09 03:00:43.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    访问被拒绝。

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 03:00:43.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/zh-cn/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/zh-cn/ERR_AGENT_CONFIGURE 2014-03-09 03:00:44.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    错误

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_AGENT_WPAD squid-3.4.4.1/errors/zh-cn/ERR_AGENT_WPAD --- squid-3.4.4/errors/zh-cn/ERR_AGENT_WPAD 2014-03-09 03:00:44.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    错误

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/zh-cn/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/zh-cn/ERR_CACHE_ACCESS_DENIED 2014-03-09 03:00:45.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: Cache Access Denied

    ERROR

    Cache 访问被拒绝。

    当尝试取回该 URL 时遇到下面的错误：%U

    缓存访问被拒绝。

    抱歉，您不被允许通过本网络缓存服务器访问下列位置 %U 除非您通过了我们的身份验证。

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 03:00:45.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: Cache Manager Access Denied

    ERROR

    Cache Manager 访问被拒绝。

    当尝试取回该 URL 时遇到下面的错误：%U

    缓存管理访问被拒绝。

    抱歉，您不被允许通过本缓存管理器访问以下位置 %U 除非您通过我们的身份验证。

    如果您是在身份验证上发生问题，请先确定您有权对缓存使用管理器。或是与管理者联系。如果您就是管理者，请详细阅读 Squid 所附文件中与 cache manager 有关部份或检查 cache log 以便得到更详尽的细节。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/zh-cn/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/zh-cn/ERR_CANNOT_FORWARD 2014-03-09 03:00:46.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    目前无法将您的请求进行转送操作

    This request could not be forwarded to the origin server or to any parent caches.

    可能的问题包括：

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_CONFLICT_HOST squid-3.4.4.1/errors/zh-cn/ERR_CONFLICT_HOST --- squid-3.4.4/errors/zh-cn/ERR_CONFLICT_HOST 2014-03-09 03:00:46.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    可能的问题包括：

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_CONNECT_FAIL squid-3.4.4.1/errors/zh-cn/ERR_CONNECT_FAIL --- squid-3.4.4/errors/zh-cn/ERR_CONNECT_FAIL 2014-03-09 03:00:47.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    连接到 %I 失败。

    系统返回以下内容：%E

    The remote host or network may be down. Please try the request again.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_DIR_LISTING squid-3.4.4.1/errors/zh-cn/ERR_DIR_LISTING --- squid-3.4.4/errors/zh-cn/ERR_DIR_LISTING 2014-03-09 03:00:48.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 文件夹： %U

    文件夹： %U/

    文件夹内容：

    %z
    %g
    上级文件夹 (根文件夹)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_DNS_FAIL squid-3.4.4.1/errors/zh-cn/ERR_DNS_FAIL --- squid-3.4.4/errors/zh-cn/ERR_DNS_FAIL 2014-03-09 03:00:48.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    不能由主机名 %H 确定 IP 地址。

    DNS 服务器返回了：

    %z

    这表示 缓存服务器无法解析您输入网址（URL）中的主机名称， 请检查该名称是否正确。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ESI squid-3.4.4.1/errors/zh-cn/ERR_ESI --- squid-3.4.4/errors/zh-cn/ERR_ESI 2014-03-09 03:00:49.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    ESI 处理失败。

    ESI 处理器返回了：

    %Z

    这意味着代理不能处理 ESI 模板。请向网站管理员报告这个错误。

    您的网站管理员是 %w。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/zh-cn/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/zh-cn/ERR_FORWARDING_DENIED 2014-03-09 03:00:49.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    拒绝转送

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_DISABLED squid-3.4.4.1/errors/zh-cn/ERR_FTP_DISABLED --- squid-3.4.4/errors/zh-cn/ERR_FTP_DISABLED 2014-03-09 03:00:50.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    FTP 被禁用

    本缓存服务器未开放文件传输服务。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_FAILURE squid-3.4.4.1/errors/zh-cn/ERR_FTP_FAILURE --- squid-3.4.4/errors/zh-cn/ERR_FTP_FAILURE 2014-03-09 03:00:50.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    尝试获取该URL:%U时发生一个FTP协议错误

    本缓存服务器发出以下 FTP 命令：

    %f

    服务器回应了：

    %F
    %g

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/zh-cn/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/zh-cn/ERR_FTP_FORBIDDEN 2014-03-09 03:00:51.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    尝试获取 URL: %U 时发生一个FTP认证错误

    本缓存服务器发出以下 FTP 命令：

    %f

    服务器回应了：

    %F
    %g

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/zh-cn/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/zh-cn/ERR_FTP_NOT_FOUND 2014-03-09 03:00:51.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    无法取回下面的 URL： %U

    本缓存服务器发出以下 FTP 命令：

    %f

    服务器回应了：

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_CREATED 2014-03-09 03:00:52.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    操作成功

    文件已创建


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_ERROR 2014-03-09 03:00:52.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: FTP upload failed

    ERROR

    FTP PUT upload failed

    尝试获取该URL:%U时发生一个FTP协议错误

    本缓存服务器发出以下 FTP 命令：

    %f

    服务器回应了：

    %F

    这说明 FTP 服务器可能没有权限或空间存储该文件。请检查路径、权限、磁盘空间后重试。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/zh-cn/ERR_FTP_PUT_MODIFIED 2014-03-09 03:00:53.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    操作成功

    文件已更新


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/zh-cn/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/zh-cn/ERR_FTP_UNAVAILABLE 2014-03-09 03:00:53.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    FTP 服务器太忙，无法取回 URL： %U

    本缓存服务器发出以下 FTP 命令：

    %f

    服务器回应了：

    %F
    %g

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/zh-cn/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/zh-cn/ERR_GATEWAY_FAILURE 2014-03-09 03:00:54.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ICAP_FAILURE squid-3.4.4.1/errors/zh-cn/ERR_ICAP_FAILURE --- squid-3.4.4/errors/zh-cn/ERR_ICAP_FAILURE 2014-03-09 03:00:55.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    ICAP 协议错误。

    系统返回以下内容：%E

    这意味着 ICAP 通信的某些地方失败了。

    可能的问题包括：

    • 无法到达 ICAP 服务器。

    • 收到来自 ICAP 服务器的一个非法响应。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_INVALID_REQ squid-3.4.4.1/errors/zh-cn/ERR_INVALID_REQ --- squid-3.4.4/errors/zh-cn/ERR_INVALID_REQ 2014-03-09 03:00:55.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    非法请求 尝试处理请求是发生错误:

    %R

    可能的问题包括：

    • 缺少请求方式或未知的请求方式

    • 缺少网址

    • 缺少 HTTP 标识(HTTP/1.0)

    • 请求命令过长

    • POST 或 PUT 请求中丢失内容长度(Content-Length)。

    • 主机名称中包含不合法的字符；下划线是不允许的。

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_INVALID_RESP squid-3.4.4.1/errors/zh-cn/ERR_INVALID_RESP --- squid-3.4.4/errors/zh-cn/ERR_INVALID_RESP 2014-03-09 03:00:56.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    非法响应 尝试处理请求时发生错误:

    %R

    无法理解联系的服务器所传回的 HTTP 响应消息或者它已经损坏。请联系网站运行人员。

    如果需要，您的缓存管理员可以提供更多细节以助了解该问题的准确性质。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_INVALID_URL squid-3.4.4.1/errors/zh-cn/ERR_INVALID_URL --- squid-3.4.4/errors/zh-cn/ERR_INVALID_URL 2014-03-09 03:00:56.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    无效的网址

    请求的 URL 地址有些部分不正确。

    可能的问题包括：

    • 缺少或不正确的通讯协议（应该如 http://或类似的开头）

    • 缺少欲连结的主机名称

    • 网址路径中有不合法双重转义符

    • 主机名称中包含不合法的字符；下划线是不允许的。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_LIFETIME_EXP squid-3.4.4.1/errors/zh-cn/ERR_LIFETIME_EXP --- squid-3.4.4/errors/zh-cn/ERR_LIFETIME_EXP 2014-03-09 03:00:57.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    连接已过期

    缓存服务器已终止您的连接请求，因为已经超过了最大连接等待时间。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_NO_RELAY squid-3.4.4.1/errors/zh-cn/ERR_NO_RELAY --- squid-3.4.4/errors/zh-cn/ERR_NO_RELAY 2014-03-09 03:00:58.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    无 Wais 中继

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS 2014-03-09 03:00:58.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    请求的文件在本缓存服务器上未找到，而您设定了only-if-cached（只读取缓存）指令。

    您送出了一个包含 only-if-cached （只读取缓存）缓存控制指令的连结请求。而所要的文件并未存在于本缓存服务器中，或者这个连结请求需要刷新文件而 only-if-cached 指令禁止这么做。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/error-details.txt squid-3.4.4.1/errors/zh-cn/error-details.txt --- squid-3.4.4/errors/zh-cn/error-details.txt 2014-03-09 03:01:07.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/zh-cn/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/zh-cn/ERR_PRECONDITION_FAILED 2014-03-09 03:00:59.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_READ_ERROR squid-3.4.4.1/errors/zh-cn/ERR_READ_ERROR --- squid-3.4.4/errors/zh-cn/ERR_READ_ERROR 2014-03-09 03:00:59.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    读取错误

    系统返回以下内容：%E

    An error condition occurred while reading data from the network. Please retry your request.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_READ_TIMEOUT squid-3.4.4.1/errors/zh-cn/ERR_READ_TIMEOUT --- squid-3.4.4/errors/zh-cn/ERR_READ_TIMEOUT 2014-03-09 03:01:00.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    读取超时

    系统返回以下内容：%E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/zh-cn/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/zh-cn/ERR_SECURE_CONNECT_FAIL 2014-03-09 03:01:01.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    建立到 %I 的安全连接失败

    The system returned:

    %E (TLS code: %x)

    %D

    此代理和远端主机无法为处理您的请求在相互可接受的安全设置上协商一致。有可能远端计算机不支持安全连接，或者代理对主机的安全凭据不认可。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/zh-cn/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/zh-cn/ERR_SHUTTING_DOWN 2014-03-09 03:01:01.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/zh-cn/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/zh-cn/ERR_SOCKET_FAILURE 2014-03-09 03:01:02.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    Socket 建立失败

    系统返回以下内容：%E

    Squid （缓存服务器）无法建立 TCP socket（无法向系统申请建立新的网络连接），可能是因为负荷过重，请重新尝试。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_TOO_BIG squid-3.4.4.1/errors/zh-cn/ERR_TOO_BIG --- squid-3.4.4/errors/zh-cn/ERR_TOO_BIG 2014-03-09 03:01:03.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    请求或响应太大

    如果您在执行 POST 或 PUT 请求，那是您要上传的东西太大。

    如果您在执行 GET 请求，那是您要下载的项目太大。

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/zh-cn/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/zh-cn/ERR_UNSUP_HTTPVERSION 2014-03-09 03:01:04.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    不支持的 HTTP 版本

    当尝试取回该 URL 时遇到下面的错误：%U

    Unsupported HTTP version

    此版本的 Squid 不接受您试图使用的 HTTP 版本。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_UNSUP_REQ squid-3.4.4.1/errors/zh-cn/ERR_UNSUP_REQ --- squid-3.4.4/errors/zh-cn/ERR_UNSUP_REQ 2014-03-09 03:01:04.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    不支持的请求方式和协议

    Squid （缓存服务器）不能对所有的存取协议支持所有的请求方式。比如说，你不能对 GOPHER 进行一个 POST 请求。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_URN_RESOLVE squid-3.4.4.1/errors/zh-cn/ERR_URN_RESOLVE --- squid-3.4.4/errors/zh-cn/ERR_URN_RESOLVE 2014-03-09 03:01:05.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: The requested URN could not be retrieved

    ERROR

    URN 中的一个网址（URL）无法获取

    当尝试读取以下 URN 时： %U

    不能解析 URN

    抱歉！您不能对 %T 上的 URNs 期待太多 :)

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_WRITE_ERROR squid-3.4.4.1/errors/zh-cn/ERR_WRITE_ERROR --- squid-3.4.4/errors/zh-cn/ERR_WRITE_ERROR 2014-03-09 03:01:06.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    写入错误

    系统返回以下内容：%E

    An error condition occurred while writing to the network. Please retry your request.

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-cn/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/zh-cn/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/zh-cn/ERR_ZERO_SIZE_OBJECT 2014-03-09 03:01:07.000000000 -0700 +++ squid-3.4.4.1/errors/zh-cn/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 错误: 您所请求的网址（URL）无法获取

    ERROR

    The requested URL could not be retrieved

    当尝试取回该 URL 时遇到下面的错误：%U

    响应内容长度为零

    本缓存服务器从被连接的服务器上没有收到任何数据。

    缓存服务器的管理员 %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ACCESS_DENIED squid-3.4.4.1/errors/zh-tw/ERR_ACCESS_DENIED --- squid-3.4.4/errors/zh-tw/ERR_ACCESS_DENIED 2014-03-09 03:01:07.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    存取被拒絕

    Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED squid-3.4.4.1/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED --- squid-3.4.4/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED 2014-03-09 03:01:09.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Time Quota Exceeded.

    This proxy limits your time online with a quota. Your time budget is now empty but will be refilled when the configured time period starts again.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_AGENT_CONFIGURE squid-3.4.4.1/errors/zh-tw/ERR_AGENT_CONFIGURE --- squid-3.4.4/errors/zh-tw/ERR_AGENT_CONFIGURE 2014-03-09 03:01:09.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_AGENT_CONFIGURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    錯誤

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • In the HTTP proxy box type the proxy name %h and port %b.
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • In the HTTP proxy box type the proxy name %h and port %b.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_AGENT_WPAD squid-3.4.4.1/errors/zh-tw/ERR_AGENT_WPAD --- squid-3.4.4/errors/zh-tw/ERR_AGENT_WPAD 2014-03-09 03:01:10.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_AGENT_WPAD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Web Browser Configuration

    錯誤

    Web Browser Configuration

    Your Web Browser configuration needs to be corrected to use this network.

    How to find these settings in your browser:

    For Firefox browsers go to:
    • Tools -> Options -> Advanced -> Network -> Connection Settings
    • Select Auto-detect proxy settings for this network
    For Internet Explorer browsers go to:
    • Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
    • Select Automatically detect settings
    For Opera browsers go to:
    • Tools -> Preferences -> Advanced -> Network -> Proxy Servers
    • Select Use Automatic proxy configuration

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_CACHE_ACCESS_DENIED squid-3.4.4.1/errors/zh-tw/ERR_CACHE_ACCESS_DENIED --- squid-3.4.4/errors/zh-tw/ERR_CACHE_ACCESS_DENIED 2014-03-09 03:01:11.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_CACHE_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: Cache Access Denied

    ERROR

    Cache 存取被拒絕

    The following error was encountered while trying to retrieve the URL: %U

    快取伺服器存取被拒絕

    抱歉，您不被允許透過我們這個網路快取伺服器傳回下列位置 %U 除非您通過了我們的身份驗證。

    Please contact the cache administrator if you have difficulties authenticating yourself.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED squid-3.4.4.1/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED --- squid-3.4.4/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED 2014-03-09 03:01:12.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: Cache Manager Access Denied

    ERROR

    Cache Manager 存取被拒絕

    The following error was encountered while trying to retrieve the URL: %U

    快取伺服器管理程式使用被拒

    抱歉，您不被允許透過我們這個快取伺服器管理程式傳回下列位置 %U 除非您通過我們的身份驗證。

    如果您是在身份驗證上發生問題，請先確定您有權對快取伺服器使用管理程式。或是與管理者聯繫。如果您就是管理者，請詳細閱讀 Squid 所附文件中與cache manager 有關部份或檢查 cache log 以便得到更詳盡的細節。


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_CANNOT_FORWARD squid-3.4.4.1/errors/zh-tw/ERR_CANNOT_FORWARD --- squid-3.4.4/errors/zh-tw/ERR_CANNOT_FORWARD 2014-03-09 03:01:12.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_CANNOT_FORWARD 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    目前無法替您的網站連結要求進行轉向動作

    This request could not be forwarded to the origin server or to any parent caches.

    Some possible problems are:

    • An Internet connection needed to access this domains origin servers may be down.
    • All configured parent caches may be currently unreachable.
    • The administrator may not allow this cache to make direct connections to origin servers.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_CONFLICT_HOST squid-3.4.4.1/errors/zh-tw/ERR_CONFLICT_HOST --- squid-3.4.4/errors/zh-tw/ERR_CONFLICT_HOST 2014-03-09 03:01:13.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_CONFLICT_HOST 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    URI Host Conflict

    This means the domain name you are trying to access apparently no longer exists on the machine you are requesting it from.

    Some possible problems are:

    • The domain may have moved very recently. Trying again will resolve that.
    • The website may require you to use a local country-based version. Using your ISP provided DNS server(s) should resolve that.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_CONNECT_FAIL squid-3.4.4.1/errors/zh-tw/ERR_CONNECT_FAIL --- squid-3.4.4/errors/zh-tw/ERR_CONNECT_FAIL 2014-03-09 03:01:14.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Connection to %I failed.

    系統回應了下列錯誤訊息：%E

    The remote host or network may be down. Please try the request again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_DIR_LISTING squid-3.4.4.1/errors/zh-tw/ERR_DIR_LISTING --- squid-3.4.4/errors/zh-tw/ERR_DIR_LISTING 2014-03-09 03:01:14.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_DIR_LISTING 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - Directory: %U

    Directory: %U/

    Directory Content:

    %z
    %g
    Parent Directory (Root Directory)
    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_DNS_FAIL squid-3.4.4.1/errors/zh-tw/ERR_DNS_FAIL --- squid-3.4.4/errors/zh-tw/ERR_DNS_FAIL 2014-03-09 03:01:16.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_DNS_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    無法將您輸入的網站主機位置轉譯成正確的 IP 位置 %H

    The DNS server returned:

    %z

    This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ESI squid-3.4.4.1/errors/zh-tw/ERR_ESI --- squid-3.4.4/errors/zh-tw/ERR_ESI 2014-03-09 03:01:16.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ESI 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ESI Processing failed.

    The ESI processor returned:

    %Z

    This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

    Your webmaster is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FORWARDING_DENIED squid-3.4.4.1/errors/zh-tw/ERR_FORWARDING_DENIED --- squid-3.4.4/errors/zh-tw/ERR_FORWARDING_DENIED 2014-03-09 03:01:18.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FORWARDING_DENIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    轉送要求被拒

    This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_DISABLED squid-3.4.4.1/errors/zh-tw/ERR_FTP_DISABLED --- squid-3.4.4/errors/zh-tw/ERR_FTP_DISABLED 2014-03-09 03:01:18.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_DISABLED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    禁止使用檔案傳輸

    本快取伺服器並未開放支援檔案傳輸服務。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_FAILURE squid-3.4.4.1/errors/zh-tw/ERR_FTP_FAILURE --- squid-3.4.4/errors/zh-tw/ERR_FTP_FAILURE 2014-03-09 03:01:19.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    在嘗試傳回下面的網址（URL）時發生檔案傳輸通訊協定錯誤：%U

    Squid 伺服器替您送出下列檔案傳輸命令：

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_FORBIDDEN squid-3.4.4.1/errors/zh-tw/ERR_FTP_FORBIDDEN --- squid-3.4.4/errors/zh-tw/ERR_FTP_FORBIDDEN 2014-03-09 03:01:20.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_FORBIDDEN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    An FTP authentication failure occurred while trying to retrieve the URL: %U

    Squid 伺服器替您送出下列檔案傳輸命令：

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_NOT_FOUND squid-3.4.4.1/errors/zh-tw/ERR_FTP_NOT_FOUND --- squid-3.4.4/errors/zh-tw/ERR_FTP_NOT_FOUND 2014-03-09 03:01:20.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_NOT_FOUND 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following URL could not be retrieved: %U

    Squid 伺服器替您送出下列檔案傳輸命令：

    %f

    The server responded with:

    %F
    %g

    This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_CREATED squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_CREATED --- squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_CREATED 2014-03-09 03:01:21.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_CREATED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    所要求的指令成功地被完成

    檔案已被成功地建立


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_ERROR squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_ERROR --- squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_ERROR 2014-03-09 03:01:21.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: FTP upload failed

    ERROR

    FTP PUT upload failed

    在嘗試傳回下面的網址（URL）時發生檔案傳輸通訊協定錯誤：%U

    Squid 伺服器替您送出下列檔案傳輸命令：

    %f

    The server responded with:

    %F

    This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_MODIFIED squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_MODIFIED --- squid-3.4.4/errors/zh-tw/ERR_FTP_PUT_MODIFIED 2014-03-09 03:01:22.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_PUT_MODIFIED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - FTP PUT Successful.

    所要求的指令成功地被完成

    檔案已被更新了


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_FTP_UNAVAILABLE squid-3.4.4.1/errors/zh-tw/ERR_FTP_UNAVAILABLE --- squid-3.4.4/errors/zh-tw/ERR_FTP_UNAVAILABLE 2014-03-09 03:01:23.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_FTP_UNAVAILABLE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The FTP server was too busy to retrieve the URL: %U

    Squid 伺服器替您送出下列檔案傳輸命令：

    %f

    The server responded with:

    %F
    %g

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_GATEWAY_FAILURE squid-3.4.4.1/errors/zh-tw/ERR_GATEWAY_FAILURE --- squid-3.4.4/errors/zh-tw/ERR_GATEWAY_FAILURE 2014-03-09 03:01:23.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_GATEWAY_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Gateway Proxy Failure

    A non-recoverable internal failure or configuration problem prevents this request from being completed.

    This may be due to limits established by the Internet Service Provider who operates this cache. Please contact them directly for more information.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ICAP_FAILURE squid-3.4.4.1/errors/zh-tw/ERR_ICAP_FAILURE --- squid-3.4.4/errors/zh-tw/ERR_ICAP_FAILURE 2014-03-09 03:01:24.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ICAP_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    ICAP protocol error.

    系統回應了下列錯誤訊息：%E

    This means that some aspect of the ICAP communication failed.

    Some possible problems are:

    • The ICAP server is not reachable.

    • An Illegal response was received from the ICAP server.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_INVALID_REQ squid-3.4.4.1/errors/zh-tw/ERR_INVALID_REQ --- squid-3.4.4/errors/zh-tw/ERR_INVALID_REQ 2014-03-09 03:01:24.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_INVALID_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    Invalid Request error was encountered while trying to process the request:

    %R

    Some possible problems are:

    • 要求方式遺失或是未知

    • 網站位置遺失

    • HTTP 標準的宣告遺失（HTTP/1.0）

    • 要求命令過長

    • Content-Length missing for POST or PUT requests.

    • 欲連結的主機名稱包含不合法的字元；底線這個字元是不被允許存在的。

    • HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_INVALID_RESP squid-3.4.4.1/errors/zh-tw/ERR_INVALID_RESP --- squid-3.4.4/errors/zh-tw/ERR_INVALID_RESP 2014-03-09 03:01:25.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_INVALID_RESP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    Invalid Response error was encountered while trying to process the request:

    %R

    The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

    Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_INVALID_URL squid-3.4.4.1/errors/zh-tw/ERR_INVALID_URL --- squid-3.4.4/errors/zh-tw/ERR_INVALID_URL 2014-03-09 03:01:25.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_INVALID_URL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    不正確的位置

    Some aspect of the requested URL is incorrect.

    Some possible problems are:

    • 缺少或不正確的通訊協定宣告（應該是 http:// 或是類似的開頭）

    • 缺少欲連結的主機名稱

    • 不合法的網站連結路徑（缺少 //）

    • 欲連結的主機名稱包含不合法的字元；底線這個字元是不被允許存在的。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_LIFETIME_EXP squid-3.4.4.1/errors/zh-tw/ERR_LIFETIME_EXP --- squid-3.4.4/errors/zh-tw/ERR_LIFETIME_EXP 2014-03-09 03:01:26.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_LIFETIME_EXP 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    超過連線等待時限

    快取伺服器已終止您的連線要求，因為已經超過連線等待時限。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_NO_RELAY squid-3.4.4.1/errors/zh-tw/ERR_NO_RELAY --- squid-3.4.4/errors/zh-tw/ERR_NO_RELAY 2014-03-09 03:01:26.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_NO_RELAY 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    不提供 Wais（廣域資訊伺服器）轉接

    There is no WAIS Relay host defined for this Cache! Yell at the administrator.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS squid-3.4.4.1/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS --- squid-3.4.4/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS 2014-03-09 03:01:27.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    您要求的文件並未存在於本快取伺服器上，而且您設定了 only-if-cached 指令。

    您送出了一個包含 only-if-cached 快取控制指令的連結要求。而文件並未存在快取伺服器中，或者 這個連線要求被 only-if-cached 指令認定是禁用的。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/error-details.txt squid-3.4.4.1/errors/zh-tw/error-details.txt --- squid-3.4.4/errors/zh-tw/error-details.txt 2014-03-09 03:01:33.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/error-details.txt 1969-12-31 16:00:00.000000000 -0800 @@ -1,223 +0,0 @@ -name: SQUID_X509_V_ERR_INFINITE_VALIDATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Cert validation infinite loop detected" - -name: SQUID_ERR_SSL_HANDSHAKE -detail: "%ssl_error_descr: %ssl_lib_error" -descr: "Handshake with SSL server failed" - -name: SQUID_X509_V_ERR_DOMAIN_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate does not match domainname" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get issuer certificate" - -name: X509_V_ERR_UNABLE_TO_GET_CRL -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to get certificate CRL" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt certificate's signature" - -name: X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to decrypt CRL's signature" - -name: X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY -detail: "Unable to decode issuer (CA) public key: %ssl_ca_name" -descr: "Unable to decode issuer public key" - -name: X509_V_ERR_CERT_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate signature failure" - -name: X509_V_ERR_CRL_SIGNATURE_FAILURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL signature failure" - -name: X509_V_ERR_CERT_NOT_YET_VALID -detail: "SSL Certficate is not valid before: %ssl_notbefore" -descr: "Certificate is not yet valid" - -name: X509_V_ERR_CERT_HAS_EXPIRED -detail: "SSL Certificate expired on: %ssl_notafter" -descr: "Certificate has expired" - -name: X509_V_ERR_CRL_NOT_YET_VALID -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL is not yet valid" - -name: X509_V_ERR_CRL_HAS_EXPIRED -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL has expired" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD -detail: "SSL Certificate has invalid start date (the 'not before' field): %ssl_subject" -descr: "Format error in certificate's notBefore field" - -name: X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD -detail: "SSL Certificate has invalid expiration date (the 'not after' field): %ssl_subject" -descr: "Format error in certificate's notAfter field" - -name: X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's lastUpdate field" - -name: X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD -detail: "%ssl_error_descr: %ssl_subject" -descr: "Format error in CRL's nextUpdate field" - -name: X509_V_ERR_OUT_OF_MEM -detail: "%ssl_error_descr" -descr: "Out of memory" - -name: X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT -detail: "Self-signed SSL Certificate: %ssl_subject" -descr: "Self signed certificate" - -name: X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN -detail: "Self-signed SSL Certificate in chain: %ssl_subject" -descr: "Self signed certificate in certificate chain" - -name: X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY -detail: "SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name" -descr: "Unable to get local issuer certificate" - -name: X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unable to verify the first certificate" - -name: X509_V_ERR_CERT_CHAIN_TOO_LONG -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate chain too long" - -name: X509_V_ERR_CERT_REVOKED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate revoked" - -name: X509_V_ERR_INVALID_CA -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Invalid CA certificate" - -name: X509_V_ERR_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Path length constraint exceeded" - -name: X509_V_ERR_INVALID_PURPOSE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported certificate purpose" - -name: X509_V_ERR_CERT_UNTRUSTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate not trusted" - -name: X509_V_ERR_CERT_REJECTED -detail: "%ssl_error_descr: %ssl_subject" -descr: "Certificate rejected" - -name: X509_V_ERR_SUBJECT_ISSUER_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Subject issuer mismatch" - -name: X509_V_ERR_AKID_SKID_MISMATCH -detail: "%ssl_error_descr: %ssl_subject" -descr: "Authority and subject key identifier mismatch" - -name: X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH -detail: "%ssl_error_descr: %ssl_ca_name" -descr: "Authority and issuer serial number mismatch" - -name: X509_V_ERR_KEYUSAGE_NO_CERTSIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "Key usage does not include certificate signing" - -name: X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER -detail: "%ssl_error_descr: %ssl_subject" -descr: "unable to get CRL issuer certificate" - -name: X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical extension" - -name: X509_V_ERR_KEYUSAGE_NO_CRL_SIGN -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include CRL signing" - -name: X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "unhandled critical CRL extension" - -name: X509_V_ERR_INVALID_NON_CA -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid non-CA certificate (has CA markings)" - -name: X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy path length constraint exceeded" - -name: X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "key usage does not include digital signature" - -name: X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED -detail: "%ssl_error_descr: %ssl_subject" -descr: "proxy certificates not allowed, please set the appropriate flag" - -name: X509_V_ERR_INVALID_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate extension" - -name: X509_V_ERR_INVALID_POLICY_EXTENSION -detail: "%ssl_error_descr: %ssl_subject" -descr: "invalid or inconsistent certificate policy extension" - -name: X509_V_ERR_NO_EXPLICIT_POLICY -detail: "%ssl_error_descr: %ssl_subject" -descr: "no explicit policy" - -name: X509_V_ERR_DIFFERENT_CRL_SCOPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Different CRL scope" - -name: X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE -detail: "%ssl_error_descr: %ssl_subject" -descr: "Unsupported extension feature" - -name: X509_V_ERR_UNNESTED_RESOURCE -detail: "%ssl_error_descr: %ssl_subject" -descr: "RFC 3779 resource not subset of parent's resources" - -name: X509_V_ERR_PERMITTED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "permitted subtree violation" - -name: X509_V_ERR_EXCLUDED_VIOLATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "excluded subtree violation" - -name: X509_V_ERR_SUBTREE_MINMAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "name constraints minimum and maximum not supported" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported name constraint type" - -name: X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name constraint syntax" - -name: X509_V_ERR_UNSUPPORTED_NAME_SYNTAX -detail: "%ssl_error_descr: %ssl_subject" -descr: "unsupported or invalid name syntax" - -name: X509_V_ERR_CRL_PATH_VALIDATION_ERROR -detail: "%ssl_error_descr: %ssl_subject" -descr: "CRL path validation error" - -name: X509_V_ERR_APPLICATION_VERIFICATION -detail: "%ssl_error_descr: %ssl_subject" -descr: "Application verification failure" diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_PRECONDITION_FAILED squid-3.4.4.1/errors/zh-tw/ERR_PRECONDITION_FAILED --- squid-3.4.4/errors/zh-tw/ERR_PRECONDITION_FAILED 2014-03-09 03:01:27.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_PRECONDITION_FAILED 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Precondition Failed.

    This means:

    At least one precondition specified by the HTTP client in the request header has failed.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_READ_ERROR squid-3.4.4.1/errors/zh-tw/ERR_READ_ERROR --- squid-3.4.4/errors/zh-tw/ERR_READ_ERROR 2014-03-09 03:01:28.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_READ_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    讀取錯誤

    系統回應了下列錯誤訊息：%E

    An error condition occurred while reading data from the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_READ_TIMEOUT squid-3.4.4.1/errors/zh-tw/ERR_READ_TIMEOUT --- squid-3.4.4/errors/zh-tw/ERR_READ_TIMEOUT 2014-03-09 03:01:29.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_READ_TIMEOUT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    超過讀取時限

    系統回應了下列錯誤訊息：%E

    A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_SECURE_CONNECT_FAIL squid-3.4.4.1/errors/zh-tw/ERR_SECURE_CONNECT_FAIL --- squid-3.4.4/errors/zh-tw/ERR_SECURE_CONNECT_FAIL 2014-03-09 03:01:29.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_SECURE_CONNECT_FAIL 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Failed to establish a secure connection to %I

    The system returned:

    %E (TLS code: %x)

    %D

    This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_SHUTTING_DOWN squid-3.4.4.1/errors/zh-tw/ERR_SHUTTING_DOWN --- squid-3.4.4/errors/zh-tw/ERR_SHUTTING_DOWN 2014-03-09 03:01:30.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_SHUTTING_DOWN 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_SOCKET_FAILURE squid-3.4.4.1/errors/zh-tw/ERR_SOCKET_FAILURE --- squid-3.4.4/errors/zh-tw/ERR_SOCKET_FAILURE 2014-03-09 03:01:30.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_SOCKET_FAILURE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    Socket 建立失敗

    系統回應了下列錯誤訊息：%E

    Squid （網路快取程式）無法建立 TCP socket，可能是因為過重的負荷導致這個問題，請重新嘗試一遍您的連結要求。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_TOO_BIG squid-3.4.4.1/errors/zh-tw/ERR_TOO_BIG --- squid-3.4.4/errors/zh-tw/ERR_TOO_BIG 2014-03-09 03:01:31.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_TOO_BIG 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    The request or reply is too large.

    If you are making a POST or PUT request, then the item you are trying to upload is too large.

    If you are making a GET request, then the item you are trying to download is too large.

    These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_UNSUP_HTTPVERSION squid-3.4.4.1/errors/zh-tw/ERR_UNSUP_HTTPVERSION --- squid-3.4.4/errors/zh-tw/ERR_UNSUP_HTTPVERSION 2014-03-09 03:01:31.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_UNSUP_HTTPVERSION 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    Unsupported HTTP version

    The following error was encountered while trying to retrieve the URL: %U

    Unsupported HTTP version

    This Squid does not accept the HTTP version you are attempting to use.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_UNSUP_REQ squid-3.4.4.1/errors/zh-tw/ERR_UNSUP_REQ --- squid-3.4.4/errors/zh-tw/ERR_UNSUP_REQ 2014-03-09 03:01:32.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_UNSUP_REQ 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    尚未支援的要求方式或通訊協定

    因為 Squid （網路快取程式）並未支援所有的連結要求方式在各式通訊協定上。比如說，你不能要求一個 GOPHER 的 POST 連結要求。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_URN_RESOLVE squid-3.4.4.1/errors/zh-tw/ERR_URN_RESOLVE --- squid-3.4.4/errors/zh-tw/ERR_URN_RESOLVE 2014-03-09 03:01:32.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_URN_RESOLVE 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: The requested URN could not be retrieved

    ERROR

    URN 中的一個網址（URL）無法被傳回

    The following error was encountered while trying to retrieve the URN: %U

    無法解譯 URN

    抱歉！您不能對 URNs 在 %T 上期待太多 :)

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_WRITE_ERROR squid-3.4.4.1/errors/zh-tw/ERR_WRITE_ERROR --- squid-3.4.4/errors/zh-tw/ERR_WRITE_ERROR 2014-03-09 03:01:33.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_WRITE_ERROR 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    寫入錯誤

    系統回應了下列錯誤訊息：%E

    An error condition occurred while writing to the network. Please retry your request.

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/errors/zh-tw/ERR_ZERO_SIZE_OBJECT squid-3.4.4.1/errors/zh-tw/ERR_ZERO_SIZE_OBJECT --- squid-3.4.4/errors/zh-tw/ERR_ZERO_SIZE_OBJECT 2014-03-09 03:01:33.000000000 -0700 +++ squid-3.4.4.1/errors/zh-tw/ERR_ZERO_SIZE_OBJECT 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ - 錯誤: 欲連結之網址（URL）無法正確的傳回

    ERROR

    The requested URL could not be retrieved

    The following error was encountered while trying to retrieve the URL: %U

    大小為零的資料回應

    您的此次連線要求，Squid（網路快取程式）並未自欲連結的網站伺服器接收到任何資料。

    Your cache administrator is %w.


    \ No newline at end of file diff -u -r -N squid-3.4.4/helpers/basic_auth/DB/basic_db_auth.8 squid-3.4.4.1/helpers/basic_auth/DB/basic_db_auth.8 --- squid-3.4.4/helpers/basic_auth/DB/basic_db_auth.8 2014-03-09 03:02:25.000000000 -0700 +++ squid-3.4.4.1/helpers/basic_auth/DB/basic_db_auth.8 2014-04-23 06:00:19.000000000 -0700 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 1" -.TH BASIC_DB_AUTH 1 "2014-03-09" "perl v5.10.1" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 1 "2014-04-23" "perl v5.18.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -139,7 +148,7 @@ This program verifies username & password to a database .IP "\fB\-\-dsn\fR" 8 .IX Item "--dsn" -Database \s-1DSN\s0. Default \*(L"DBI:mysql:database=squid\*(R" +Database \s-1DSN.\s0 Default \*(L"DBI:mysql:database=squid\*(R" .IP "\fB\-\-user\fR" 8 .IX Item "--user" Database User @@ -173,7 +182,7 @@ Keep a persistent database connection open between queries. .IP "\fB\-\-joomla\fR" 8 .IX Item "--joomla" -Tells helper that user database is Joomla \s-1DB\s0. So their unusual salt +Tells helper that user database is Joomla \s-1DB. \s0 So their unusual salt hashing is understood. .SH "COPYRIGHT" .IX Header "COPYRIGHT" diff -u -r -N squid-3.4.4/helpers/basic_auth/DB/Makefile.in squid-3.4.4.1/helpers/basic_auth/DB/Makefile.in --- squid-3.4.4/helpers/basic_auth/DB/Makefile.in 2014-03-09 01:41:40.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/DB/Makefile.in 2014-04-23 05:51:00.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,20 +168,218 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +418,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +436,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +474,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +539,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -368,6 +615,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -389,6 +637,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -409,8 +658,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -438,9 +690,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -449,11 +699,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -482,122 +739,171 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: +ctags CTAGS: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -646,11 +952,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -734,18 +1048,18 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man \ - install-man8 install-pdf install-pdf-am install-ps \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-libexecSCRIPTS \ - uninstall-man uninstall-man8 + ps ps-am recheck tags-am uninstall uninstall-am \ + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/fake/Makefile.in squid-3.4.4.1/helpers/basic_auth/fake/Makefile.in --- squid-3.4.4/helpers/basic_auth/fake/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/fake/Makefile.in 2014-04-23 05:51:05.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -113,30 +158,278 @@ am__DEPENDENCIES_2 = $(top_builddir)/compat/libcompat-squid.la \ $(am__DEPENDENCIES_1) basic_fake_auth_DEPENDENCIES = $(am__DEPENDENCIES_2) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_fake_auth_SOURCES) DIST_SOURCES = $(basic_fake_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -175,6 +468,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -192,6 +486,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -229,11 +524,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -292,6 +589,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -362,7 +660,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -384,6 +682,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -404,14 +703,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -432,7 +736,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -445,9 +750,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_fake_auth$(EXEEXT): $(basic_fake_auth_OBJECTS) $(basic_fake_auth_DEPENDENCIES) + +basic_fake_auth$(EXEEXT): $(basic_fake_auth_OBJECTS) $(basic_fake_auth_DEPENDENCIES) $(EXTRA_basic_fake_auth_DEPENDENCIES) @rm -f basic_fake_auth$(EXEEXT) - $(CXXLINK) $(basic_fake_auth_OBJECTS) $(basic_fake_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_fake_auth_OBJECTS) $(basic_fake_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -458,25 +764,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -484,26 +790,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -515,15 +810,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -532,101 +823,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -677,11 +1047,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -766,20 +1144,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/getpwnam/Makefile.in squid-3.4.4.1/helpers/basic_auth/getpwnam/Makefile.in --- squid-3.4.4/helpers/basic_auth/getpwnam/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/getpwnam/Makefile.in 2014-04-23 05:51:05.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ basic_getpwnam_auth_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_getpwnam_auth_SOURCES) DIST_SOURCES = $(basic_getpwnam_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +473,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +491,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +529,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +594,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -393,7 +670,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -415,6 +692,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -435,14 +713,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -463,7 +746,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -476,9 +760,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_getpwnam_auth$(EXEEXT): $(basic_getpwnam_auth_OBJECTS) $(basic_getpwnam_auth_DEPENDENCIES) + +basic_getpwnam_auth$(EXEEXT): $(basic_getpwnam_auth_OBJECTS) $(basic_getpwnam_auth_DEPENDENCIES) $(EXTRA_basic_getpwnam_auth_DEPENDENCIES) @rm -f basic_getpwnam_auth$(EXEEXT) - $(CXXLINK) $(basic_getpwnam_auth_OBJECTS) $(basic_getpwnam_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_getpwnam_auth_OBJECTS) $(basic_getpwnam_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -489,25 +774,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_getpwnam_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -516,11 +801,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -549,30 +841,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -584,15 +863,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -601,116 +876,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -759,11 +1100,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -850,21 +1199,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/LDAP/Makefile.in squid-3.4.4.1/helpers/basic_auth/LDAP/Makefile.in --- squid-3.4.4/helpers/basic_auth/LDAP/Makefile.in 2014-03-09 01:41:40.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/LDAP/Makefile.in 2014-04-23 05:51:01.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,21 +161,51 @@ basic_ldap_auth_DEPENDENCIES = $(top_builddir)/lib/libmiscencoding.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_ldap_auth_SOURCES) DIST_SOURCES = $(basic_ldap_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -152,18 +227,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -395,7 +672,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -417,6 +694,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -437,14 +715,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -465,7 +748,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -478,9 +762,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_ldap_auth$(EXEEXT): $(basic_ldap_auth_OBJECTS) $(basic_ldap_auth_DEPENDENCIES) + +basic_ldap_auth$(EXEEXT): $(basic_ldap_auth_OBJECTS) $(basic_ldap_auth_DEPENDENCIES) $(EXTRA_basic_ldap_auth_DEPENDENCIES) @rm -f basic_ldap_auth$(EXEEXT) - $(CXXLINK) $(basic_ldap_auth_OBJECTS) $(basic_ldap_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_ldap_auth_OBJECTS) $(basic_ldap_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -491,25 +776,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_ldap_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -518,11 +803,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -551,30 +843,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -586,15 +865,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -603,116 +878,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -761,11 +1102,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -852,21 +1201,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/Makefile.in squid-3.4.4.1/helpers/basic_auth/Makefile.in --- squid-3.4.4/helpers/basic_auth/Makefile.in 2014-03-09 01:41:41.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/Makefile.in 2014-04-23 05:51:02.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/basic_auth -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -412,22 +500,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -442,57 +533,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -508,12 +554,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -525,15 +566,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -542,6 +579,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -578,13 +630,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -619,10 +668,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -700,22 +754,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/basic_auth/MSNT/Makefile.in squid-3.4.4.1/helpers/basic_auth/MSNT/Makefile.in --- squid-3.4.4/helpers/basic_auth/MSNT/Makefile.in 2014-03-09 01:41:41.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/MSNT/Makefile.in 2014-04-23 05:51:01.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -121,30 +166,69 @@ $(top_builddir)/lib/rfcnb/librfcnb.la \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(basic_msnt_auth_SOURCES) DIST_SOURCES = $(basic_msnt_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -166,16 +250,213 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(sysconf_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -214,6 +495,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -231,6 +513,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -268,11 +551,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -331,6 +616,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -427,7 +713,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -449,6 +735,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -469,14 +756,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -497,7 +789,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -510,9 +803,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_msnt_auth$(EXEEXT): $(basic_msnt_auth_OBJECTS) $(basic_msnt_auth_DEPENDENCIES) + +basic_msnt_auth$(EXEEXT): $(basic_msnt_auth_OBJECTS) $(basic_msnt_auth_DEPENDENCIES) $(EXTRA_basic_msnt_auth_DEPENDENCIES) @rm -f basic_msnt_auth$(EXEEXT) - $(CXXLINK) $(basic_msnt_auth_OBJECTS) $(basic_msnt_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_msnt_auth_OBJECTS) $(basic_msnt_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -528,25 +822,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/valid.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -555,8 +849,11 @@ -rm -rf .libs _libs install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -570,30 +867,17 @@ @$(NORMAL_UNINSTALL) @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -605,15 +889,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -622,101 +902,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -767,11 +1126,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -857,20 +1224,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-sysconfDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-sysconfDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-libexecPROGRAMS \ uninstall-local uninstall-sysconfDATA diff -u -r -N squid-3.4.4/helpers/basic_auth/MSNT-multi-domain/Makefile.in squid-3.4.4.1/helpers/basic_auth/MSNT-multi-domain/Makefile.in --- squid-3.4.4/helpers/basic_auth/MSNT-multi-domain/Makefile.in 2014-03-09 01:41:40.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/MSNT-multi-domain/Makefile.in 2014-04-23 05:51:01.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,17 +168,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -173,6 +415,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -190,6 +433,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -227,11 +471,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -290,6 +536,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -359,6 +606,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -380,6 +628,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -400,8 +649,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -429,113 +681,175 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: +cscope cscopelist: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -586,11 +900,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -672,16 +994,17 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS diff -u -r -N squid-3.4.4/helpers/basic_auth/NCSA/Makefile.am squid-3.4.4.1/helpers/basic_auth/NCSA/Makefile.am --- squid-3.4.4/helpers/basic_auth/NCSA/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/NCSA/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -8,6 +8,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/basic_auth/NCSA/Makefile.in squid-3.4.4.1/helpers/basic_auth/NCSA/Makefile.in --- squid-3.4.4/helpers/basic_auth/NCSA/Makefile.in 2014-03-09 01:41:41.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/NCSA/Makefile.in 2014-04-23 05:51:02.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -118,31 +163,70 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(basic_ncsa_auth_SOURCES) DIST_SOURCES = $(basic_ncsa_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -164,18 +248,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -214,6 +495,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -231,6 +513,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -268,11 +551,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -331,6 +616,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -402,6 +688,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) @@ -409,7 +696,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -431,6 +718,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -451,14 +739,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -479,7 +772,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -492,9 +786,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_ncsa_auth$(EXEEXT): $(basic_ncsa_auth_OBJECTS) $(basic_ncsa_auth_DEPENDENCIES) + +basic_ncsa_auth$(EXEEXT): $(basic_ncsa_auth_OBJECTS) $(basic_ncsa_auth_DEPENDENCIES) $(EXTRA_basic_ncsa_auth_DEPENDENCIES) @rm -f basic_ncsa_auth$(EXEEXT) - $(CXXLINK) $(basic_ncsa_auth_OBJECTS) $(basic_ncsa_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_ncsa_auth_OBJECTS) $(basic_ncsa_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -506,25 +801,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt_md5.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -533,11 +828,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -566,30 +868,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -601,15 +890,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -618,116 +903,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -776,11 +1127,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -867,21 +1226,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/NIS/Makefile.in squid-3.4.4.1/helpers/basic_auth/NIS/Makefile.in --- squid-3.4.4/helpers/basic_auth/NIS/Makefile.in 2014-03-09 01:41:41.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/NIS/Makefile.in 2014-04-23 05:51:02.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,39 +161,296 @@ basic_nis_auth_DEPENDENCIES = $(top_builddir)/lib/libmiscencoding.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(basic_nis_auth_SOURCES) DIST_SOURCES = $(basic_nis_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -187,6 +489,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -204,6 +507,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -241,11 +545,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -304,6 +610,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -383,7 +690,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -405,6 +712,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -425,14 +733,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -453,7 +766,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -466,9 +780,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_nis_auth$(EXEEXT): $(basic_nis_auth_OBJECTS) $(basic_nis_auth_DEPENDENCIES) + +basic_nis_auth$(EXEEXT): $(basic_nis_auth_OBJECTS) $(basic_nis_auth_DEPENDENCIES) $(EXTRA_basic_nis_auth_DEPENDENCIES) @rm -f basic_nis_auth$(EXEEXT) - $(CXXLINK) $(basic_nis_auth_OBJECTS) $(basic_nis_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_nis_auth_OBJECTS) $(basic_nis_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -480,25 +795,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nis_support.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -506,26 +821,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -537,15 +841,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -554,101 +854,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -699,11 +1078,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -788,20 +1175,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/PAM/Makefile.in squid-3.4.4.1/helpers/basic_auth/PAM/Makefile.in --- squid-3.4.4/helpers/basic_auth/PAM/Makefile.in 2014-03-09 01:41:41.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/PAM/Makefile.in 2014-04-23 05:51:03.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -114,21 +159,51 @@ am__DEPENDENCIES_3 = basic_pam_auth_DEPENDENCIES = $(top_builddir)/lib/libmiscencoding.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_pam_auth_SOURCES) DIST_SOURCES = $(basic_pam_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -150,18 +225,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -200,6 +472,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -217,6 +490,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -254,11 +528,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -317,6 +593,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -393,7 +670,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -415,6 +692,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -435,14 +713,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -463,7 +746,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -476,9 +760,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_pam_auth$(EXEEXT): $(basic_pam_auth_OBJECTS) $(basic_pam_auth_DEPENDENCIES) + +basic_pam_auth$(EXEEXT): $(basic_pam_auth_OBJECTS) $(basic_pam_auth_DEPENDENCIES) $(EXTRA_basic_pam_auth_DEPENDENCIES) @rm -f basic_pam_auth$(EXEEXT) - $(CXXLINK) $(basic_pam_auth_OBJECTS) $(basic_pam_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_pam_auth_OBJECTS) $(basic_pam_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -489,25 +774,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_pam_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -516,11 +801,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -549,30 +841,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -584,15 +863,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -601,116 +876,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -759,11 +1100,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -850,21 +1199,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/POP3/Makefile.in squid-3.4.4.1/helpers/basic_auth/POP3/Makefile.in --- squid-3.4.4/helpers/basic_auth/POP3/Makefile.in 2014-03-09 01:41:42.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/POP3/Makefile.in 2014-04-23 05:51:03.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,17 +168,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -173,6 +415,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -190,6 +433,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -227,11 +471,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -290,6 +536,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -359,6 +606,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -380,6 +628,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -400,8 +649,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -429,113 +681,175 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: +cscope cscopelist: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -586,11 +900,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -672,16 +994,17 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS diff -u -r -N squid-3.4.4/helpers/basic_auth/RADIUS/Makefile.am squid-3.4.4.1/helpers/basic_auth/RADIUS/Makefile.am --- squid-3.4.4/helpers/basic_auth/RADIUS/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/RADIUS/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -15,5 +15,6 @@ basic_radius_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(SSLLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/basic_auth/RADIUS/Makefile.in squid-3.4.4.1/helpers/basic_auth/RADIUS/Makefile.in --- squid-3.4.4/helpers/basic_auth/RADIUS/Makefile.in 2014-03-09 01:41:42.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/RADIUS/Makefile.in 2014-04-23 05:51:03.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,31 +160,71 @@ am__DEPENDENCIES_3 = basic_radius_auth_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(basic_radius_auth_SOURCES) DIST_SOURCES = $(basic_radius_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -161,18 +246,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -211,6 +493,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -228,6 +511,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -265,11 +549,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -328,6 +614,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -403,13 +690,14 @@ basic_radius_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(SSLLIB) \ $(XTRA_LIBS) all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -431,6 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -451,14 +740,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -479,7 +773,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -492,9 +787,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_radius_auth$(EXEEXT): $(basic_radius_auth_OBJECTS) $(basic_radius_auth_DEPENDENCIES) + +basic_radius_auth$(EXEEXT): $(basic_radius_auth_OBJECTS) $(basic_radius_auth_DEPENDENCIES) $(EXTRA_basic_radius_auth_DEPENDENCIES) @rm -f basic_radius_auth$(EXEEXT) - $(CXXLINK) $(basic_radius_auth_OBJECTS) $(basic_radius_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_radius_auth_OBJECTS) $(basic_radius_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -506,25 +802,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radius-util.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -533,11 +829,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -566,30 +869,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -601,15 +891,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -618,116 +904,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -776,11 +1128,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -867,21 +1227,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/SASL/Makefile.in squid-3.4.4.1/helpers/basic_auth/SASL/Makefile.in --- squid-3.4.4/helpers/basic_auth/SASL/Makefile.in 2014-03-09 01:41:42.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/SASL/Makefile.in 2014-04-23 05:51:04.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ basic_sasl_auth_DEPENDENCIES = $(top_builddir)/lib/libmiscencoding.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_sasl_auth_SOURCES) DIST_SOURCES = $(basic_sasl_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +473,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +491,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +529,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +594,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -399,7 +676,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -421,6 +698,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -441,14 +719,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -469,7 +752,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -482,9 +766,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_sasl_auth$(EXEEXT): $(basic_sasl_auth_OBJECTS) $(basic_sasl_auth_DEPENDENCIES) + +basic_sasl_auth$(EXEEXT): $(basic_sasl_auth_OBJECTS) $(basic_sasl_auth_DEPENDENCIES) $(EXTRA_basic_sasl_auth_DEPENDENCIES) @rm -f basic_sasl_auth$(EXEEXT) - $(CXXLINK) $(basic_sasl_auth_OBJECTS) $(basic_sasl_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(basic_sasl_auth_OBJECTS) $(basic_sasl_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -495,25 +780,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_sasl_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -522,11 +807,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -555,30 +847,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -590,15 +869,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -607,116 +882,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -765,11 +1106,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -856,21 +1205,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/basic_auth/SMB/Makefile.in squid-3.4.4.1/helpers/basic_auth/SMB/Makefile.in --- squid-3.4.4/helpers/basic_auth/SMB/Makefile.in 2014-03-09 01:41:42.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/SMB/Makefile.in 2014-04-23 05:51:04.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am ChangeLog +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver ChangeLog check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -51,7 +96,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,8 +161,12 @@ am__DEPENDENCIES_3 = basic_smb_auth_DEPENDENCIES = $(top_builddir)/lib/libmiscencoding.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) -basic_smb_auth_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +basic_smb_auth_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -141,31 +190,254 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(basic_smb_auth_SOURCES) DIST_SOURCES = $(basic_smb_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -204,6 +476,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -221,6 +494,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -258,11 +532,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -321,6 +597,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -397,7 +674,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -419,6 +696,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -439,14 +717,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -467,7 +750,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -480,13 +764,17 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_smb_auth$(EXEEXT): $(basic_smb_auth_OBJECTS) $(basic_smb_auth_DEPENDENCIES) + +basic_smb_auth$(EXEEXT): $(basic_smb_auth_OBJECTS) $(basic_smb_auth_DEPENDENCIES) $(EXTRA_basic_smb_auth_DEPENDENCIES) @rm -f basic_smb_auth$(EXEEXT) - $(basic_smb_auth_LINK) $(basic_smb_auth_OBJECTS) $(basic_smb_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(basic_smb_auth_LINK) $(basic_smb_auth_OBJECTS) $(basic_smb_auth_LDADD) $(LIBS) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -514,9 +802,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -527,39 +813,39 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_smb_auth-basic_smb_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< basic_smb_auth-basic_smb_auth.o: basic_smb_auth.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_smb_auth-basic_smb_auth.o -MD -MP -MF $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo -c -o basic_smb_auth-basic_smb_auth.o `test -f 'basic_smb_auth.cc' || echo '$(srcdir)/'`basic_smb_auth.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo $(DEPDIR)/basic_smb_auth-basic_smb_auth.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='basic_smb_auth.cc' object='basic_smb_auth-basic_smb_auth.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_smb_auth-basic_smb_auth.o -MD -MP -MF $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo -c -o basic_smb_auth-basic_smb_auth.o `test -f 'basic_smb_auth.cc' || echo '$(srcdir)/'`basic_smb_auth.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo $(DEPDIR)/basic_smb_auth-basic_smb_auth.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='basic_smb_auth.cc' object='basic_smb_auth-basic_smb_auth.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_smb_auth-basic_smb_auth.o `test -f 'basic_smb_auth.cc' || echo '$(srcdir)/'`basic_smb_auth.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_smb_auth-basic_smb_auth.o `test -f 'basic_smb_auth.cc' || echo '$(srcdir)/'`basic_smb_auth.cc basic_smb_auth-basic_smb_auth.obj: basic_smb_auth.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_smb_auth-basic_smb_auth.obj -MD -MP -MF $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo -c -o basic_smb_auth-basic_smb_auth.obj `if test -f 'basic_smb_auth.cc'; then $(CYGPATH_W) 'basic_smb_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_smb_auth.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo $(DEPDIR)/basic_smb_auth-basic_smb_auth.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='basic_smb_auth.cc' object='basic_smb_auth-basic_smb_auth.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_smb_auth-basic_smb_auth.obj -MD -MP -MF $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo -c -o basic_smb_auth-basic_smb_auth.obj `if test -f 'basic_smb_auth.cc'; then $(CYGPATH_W) 'basic_smb_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_smb_auth.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_smb_auth-basic_smb_auth.Tpo $(DEPDIR)/basic_smb_auth-basic_smb_auth.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='basic_smb_auth.cc' object='basic_smb_auth-basic_smb_auth.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_smb_auth-basic_smb_auth.obj `if test -f 'basic_smb_auth.cc'; then $(CYGPATH_W) 'basic_smb_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_smb_auth.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_smb_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_smb_auth-basic_smb_auth.obj `if test -f 'basic_smb_auth.cc'; then $(CYGPATH_W) 'basic_smb_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_smb_auth.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -567,26 +853,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -598,15 +873,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -615,101 +886,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -760,11 +1110,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -849,20 +1207,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-libexecSCRIPTS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-libexecSCRIPTS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS \ uninstall-libexecSCRIPTS diff -u -r -N squid-3.4.4/helpers/basic_auth/SSPI/Makefile.in squid-3.4.4.1/helpers/basic_auth/SSPI/Makefile.in --- squid-3.4.4/helpers/basic_auth/SSPI/Makefile.in 2014-03-09 01:41:42.000000000 -0800 +++ squid-3.4.4.1/helpers/basic_auth/SSPI/Makefile.in 2014-04-23 05:51:05.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -117,34 +162,73 @@ am__DEPENDENCIES_3 = basic_sspi_auth_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) -basic_sspi_auth_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +basic_sspi_auth_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(basic_sspi_auth_SOURCES) DIST_SOURCES = $(basic_sspi_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -166,18 +250,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -216,6 +497,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -233,6 +515,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -270,11 +553,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -333,6 +618,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -415,7 +701,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -437,6 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -457,14 +744,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -485,7 +777,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -498,9 +791,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -basic_sspi_auth$(EXEEXT): $(basic_sspi_auth_OBJECTS) $(basic_sspi_auth_DEPENDENCIES) + +basic_sspi_auth$(EXEEXT): $(basic_sspi_auth_OBJECTS) $(basic_sspi_auth_DEPENDENCIES) $(EXTRA_basic_sspi_auth_DEPENDENCIES) @rm -f basic_sspi_auth$(EXEEXT) - $(basic_sspi_auth_LINK) $(basic_sspi_auth_OBJECTS) $(basic_sspi_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(basic_sspi_auth_LINK) $(basic_sspi_auth_OBJECTS) $(basic_sspi_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -512,53 +806,53 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_sspi_auth-valid.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< basic_sspi_auth-basic_sspi_auth.o: basic_sspi_auth.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-basic_sspi_auth.o -MD -MP -MF $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo -c -o basic_sspi_auth-basic_sspi_auth.o `test -f 'basic_sspi_auth.cc' || echo '$(srcdir)/'`basic_sspi_auth.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='basic_sspi_auth.cc' object='basic_sspi_auth-basic_sspi_auth.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-basic_sspi_auth.o -MD -MP -MF $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo -c -o basic_sspi_auth-basic_sspi_auth.o `test -f 'basic_sspi_auth.cc' || echo '$(srcdir)/'`basic_sspi_auth.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='basic_sspi_auth.cc' object='basic_sspi_auth-basic_sspi_auth.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-basic_sspi_auth.o `test -f 'basic_sspi_auth.cc' || echo '$(srcdir)/'`basic_sspi_auth.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-basic_sspi_auth.o `test -f 'basic_sspi_auth.cc' || echo '$(srcdir)/'`basic_sspi_auth.cc basic_sspi_auth-basic_sspi_auth.obj: basic_sspi_auth.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-basic_sspi_auth.obj -MD -MP -MF $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo -c -o basic_sspi_auth-basic_sspi_auth.obj `if test -f 'basic_sspi_auth.cc'; then $(CYGPATH_W) 'basic_sspi_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_sspi_auth.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='basic_sspi_auth.cc' object='basic_sspi_auth-basic_sspi_auth.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-basic_sspi_auth.obj -MD -MP -MF $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo -c -o basic_sspi_auth-basic_sspi_auth.obj `if test -f 'basic_sspi_auth.cc'; then $(CYGPATH_W) 'basic_sspi_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_sspi_auth.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Tpo $(DEPDIR)/basic_sspi_auth-basic_sspi_auth.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='basic_sspi_auth.cc' object='basic_sspi_auth-basic_sspi_auth.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-basic_sspi_auth.obj `if test -f 'basic_sspi_auth.cc'; then $(CYGPATH_W) 'basic_sspi_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_sspi_auth.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-basic_sspi_auth.obj `if test -f 'basic_sspi_auth.cc'; then $(CYGPATH_W) 'basic_sspi_auth.cc'; else $(CYGPATH_W) '$(srcdir)/basic_sspi_auth.cc'; fi` basic_sspi_auth-valid.o: valid.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-valid.o -MD -MP -MF $(DEPDIR)/basic_sspi_auth-valid.Tpo -c -o basic_sspi_auth-valid.o `test -f 'valid.cc' || echo '$(srcdir)/'`valid.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_sspi_auth-valid.Tpo $(DEPDIR)/basic_sspi_auth-valid.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='valid.cc' object='basic_sspi_auth-valid.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-valid.o -MD -MP -MF $(DEPDIR)/basic_sspi_auth-valid.Tpo -c -o basic_sspi_auth-valid.o `test -f 'valid.cc' || echo '$(srcdir)/'`valid.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_sspi_auth-valid.Tpo $(DEPDIR)/basic_sspi_auth-valid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='valid.cc' object='basic_sspi_auth-valid.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-valid.o `test -f 'valid.cc' || echo '$(srcdir)/'`valid.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-valid.o `test -f 'valid.cc' || echo '$(srcdir)/'`valid.cc basic_sspi_auth-valid.obj: valid.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-valid.obj -MD -MP -MF $(DEPDIR)/basic_sspi_auth-valid.Tpo -c -o basic_sspi_auth-valid.obj `if test -f 'valid.cc'; then $(CYGPATH_W) 'valid.cc'; else $(CYGPATH_W) '$(srcdir)/valid.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/basic_sspi_auth-valid.Tpo $(DEPDIR)/basic_sspi_auth-valid.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='valid.cc' object='basic_sspi_auth-valid.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -MT basic_sspi_auth-valid.obj -MD -MP -MF $(DEPDIR)/basic_sspi_auth-valid.Tpo -c -o basic_sspi_auth-valid.obj `if test -f 'valid.cc'; then $(CYGPATH_W) 'valid.cc'; else $(CYGPATH_W) '$(srcdir)/valid.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/basic_sspi_auth-valid.Tpo $(DEPDIR)/basic_sspi_auth-valid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='valid.cc' object='basic_sspi_auth-valid.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-valid.obj `if test -f 'valid.cc'; then $(CYGPATH_W) 'valid.cc'; else $(CYGPATH_W) '$(srcdir)/valid.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(basic_sspi_auth_CXXFLAGS) $(CXXFLAGS) -c -o basic_sspi_auth-valid.obj `if test -f 'valid.cc'; then $(CYGPATH_W) 'valid.cc'; else $(CYGPATH_W) '$(srcdir)/valid.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -567,11 +861,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -600,30 +901,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -635,15 +923,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -652,116 +936,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -810,11 +1160,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -901,21 +1259,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/digest_auth/eDirectory/Makefile.in squid-3.4.4.1/helpers/digest_auth/eDirectory/Makefile.in --- squid-3.4.4/helpers/digest_auth/eDirectory/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/eDirectory/Makefile.in 2014-04-23 05:51:06.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -118,39 +163,296 @@ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(digest_edirectory_auth_SOURCES) DIST_SOURCES = $(digest_edirectory_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -189,6 +491,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -206,6 +509,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -243,11 +547,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -306,6 +612,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -390,7 +697,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -412,6 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -432,14 +740,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -460,7 +773,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -473,9 +787,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -digest_edirectory_auth$(EXEEXT): $(digest_edirectory_auth_OBJECTS) $(digest_edirectory_auth_DEPENDENCIES) + +digest_edirectory_auth$(EXEEXT): $(digest_edirectory_auth_OBJECTS) $(digest_edirectory_auth_DEPENDENCIES) $(EXTRA_digest_edirectory_auth_DEPENDENCIES) @rm -f digest_edirectory_auth$(EXEEXT) - $(CXXLINK) $(digest_edirectory_auth_OBJECTS) $(digest_edirectory_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(digest_edirectory_auth_OBJECTS) $(digest_edirectory_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -488,25 +803,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap_backend.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -514,26 +829,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -545,15 +849,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -562,101 +862,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -707,11 +1086,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -796,20 +1183,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/digest_auth/file/Makefile.am squid-3.4.4.1/helpers/digest_auth/file/Makefile.am --- squid-3.4.4/helpers/digest_auth/file/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/file/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -14,6 +14,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/digest_auth/file/Makefile.in squid-3.4.4.1/helpers/digest_auth/file/Makefile.in --- squid-3.4.4/helpers/digest_auth/file/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/file/Makefile.in 2014-04-23 05:51:07.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -118,31 +163,70 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(digest_file_auth_SOURCES) DIST_SOURCES = $(digest_file_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -164,18 +248,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -214,6 +495,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -231,6 +513,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -268,11 +551,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -331,6 +616,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -405,6 +691,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) @@ -413,7 +700,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -435,6 +722,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -455,14 +743,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -483,7 +776,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -496,9 +790,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -digest_file_auth$(EXEEXT): $(digest_file_auth_OBJECTS) $(digest_file_auth_DEPENDENCIES) + +digest_file_auth$(EXEEXT): $(digest_file_auth_OBJECTS) $(digest_file_auth_DEPENDENCIES) $(EXTRA_digest_file_auth_DEPENDENCIES) @rm -f digest_file_auth$(EXEEXT) - $(CXXLINK) $(digest_file_auth_OBJECTS) $(digest_file_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(digest_file_auth_OBJECTS) $(digest_file_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -510,25 +805,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_backend.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -537,11 +832,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -570,30 +872,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -605,15 +894,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -622,116 +907,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -780,11 +1131,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -871,21 +1230,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/digest_auth/LDAP/Makefile.am squid-3.4.4.1/helpers/digest_auth/LDAP/Makefile.am --- squid-3.4.4/helpers/digest_auth/LDAP/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/LDAP/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -14,6 +14,7 @@ $(COMPAT_LIB) \ $(LDAPLIB) \ $(LBERLIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/digest_auth/LDAP/Makefile.in squid-3.4.4.1/helpers/digest_auth/LDAP/Makefile.in --- squid-3.4.4/helpers/digest_auth/LDAP/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/LDAP/Makefile.in 2014-04-23 05:51:06.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -117,40 +162,297 @@ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(digest_ldap_auth_SOURCES) DIST_SOURCES = $(digest_ldap_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -189,6 +491,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -206,6 +509,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -243,11 +547,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -306,6 +612,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -380,6 +687,7 @@ $(COMPAT_LIB) \ $(LDAPLIB) \ $(LBERLIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(SSLLIB) \ $(XTRA_LIBS) @@ -388,7 +696,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,6 +718,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -430,14 +739,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -458,7 +772,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -471,9 +786,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -digest_ldap_auth$(EXEEXT): $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_DEPENDENCIES) + +digest_ldap_auth$(EXEEXT): $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_DEPENDENCIES) $(EXTRA_digest_ldap_auth_DEPENDENCIES) @rm -f digest_ldap_auth$(EXEEXT) - $(CXXLINK) $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(digest_ldap_auth_OBJECTS) $(digest_ldap_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -485,25 +801,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap_backend.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -511,26 +827,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -542,15 +847,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -559,101 +860,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -704,11 +1084,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -793,20 +1181,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/digest_auth/Makefile.in squid-3.4.4.1/helpers/digest_auth/Makefile.in --- squid-3.4.4/helpers/digest_auth/Makefile.in 2014-03-09 01:41:43.000000000 -0800 +++ squid-3.4.4.1/helpers/digest_auth/Makefile.in 2014-04-23 05:51:06.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/digest_auth -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -401,22 +489,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -431,57 +522,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -497,12 +543,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -514,15 +555,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -531,6 +568,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -567,13 +619,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -608,10 +657,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -689,22 +743,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/external_acl/AD_group/Makefile.in squid-3.4.4.1/helpers/external_acl/AD_group/Makefile.in --- squid-3.4.4/helpers/external_acl/AD_group/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/AD_group/Makefile.in 2014-04-23 05:51:07.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ am__DEPENDENCIES_3 = ext_ad_group_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_ad_group_acl_SOURCES) DIST_SOURCES = $(ext_ad_group_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +473,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +491,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +529,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +594,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -406,7 +683,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -428,6 +705,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -448,14 +726,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -476,7 +759,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -489,9 +773,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_ad_group_acl$(EXEEXT): $(ext_ad_group_acl_OBJECTS) $(ext_ad_group_acl_DEPENDENCIES) + +ext_ad_group_acl$(EXEEXT): $(ext_ad_group_acl_OBJECTS) $(ext_ad_group_acl_DEPENDENCIES) $(EXTRA_ext_ad_group_acl_DEPENDENCIES) @rm -f ext_ad_group_acl$(EXEEXT) - $(CXXLINK) $(ext_ad_group_acl_OBJECTS) $(ext_ad_group_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_ad_group_acl_OBJECTS) $(ext_ad_group_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -502,25 +787,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_ad_group_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,11 +814,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -562,30 +854,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -597,15 +876,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -614,116 +889,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -772,11 +1113,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -863,21 +1212,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/eDirectory_userip/Makefile.in squid-3.4.4.1/helpers/external_acl/eDirectory_userip/Makefile.in --- squid-3.4.4/helpers/external_acl/eDirectory_userip/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/eDirectory_userip/Makefile.in 2014-04-23 05:51:09.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -117,21 +162,51 @@ ext_edirectory_userip_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_edirectory_userip_acl_SOURCES) DIST_SOURCES = $(ext_edirectory_userip_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -153,18 +228,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -203,6 +475,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -220,6 +493,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -257,11 +531,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -320,6 +596,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -398,7 +675,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -420,6 +697,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -440,14 +718,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -468,7 +751,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -481,9 +765,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_edirectory_userip_acl$(EXEEXT): $(ext_edirectory_userip_acl_OBJECTS) $(ext_edirectory_userip_acl_DEPENDENCIES) + +ext_edirectory_userip_acl$(EXEEXT): $(ext_edirectory_userip_acl_OBJECTS) $(ext_edirectory_userip_acl_DEPENDENCIES) $(EXTRA_ext_edirectory_userip_acl_DEPENDENCIES) @rm -f ext_edirectory_userip_acl$(EXEEXT) - $(CXXLINK) $(ext_edirectory_userip_acl_OBJECTS) $(ext_edirectory_userip_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_edirectory_userip_acl_OBJECTS) $(ext_edirectory_userip_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -494,25 +779,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_edirectory_userip_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -521,11 +806,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -554,30 +846,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -589,15 +868,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -606,116 +881,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -764,11 +1105,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -855,21 +1204,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/file_userip/Makefile.in squid-3.4.4.1/helpers/external_acl/file_userip/Makefile.in --- squid-3.4.4/helpers/external_acl/file_userip/Makefile.in 2014-03-09 01:41:45.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/file_userip/Makefile.in 2014-04-23 05:51:09.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,21 +161,51 @@ ext_file_userip_acl_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_file_userip_acl_SOURCES) DIST_SOURCES = $(ext_file_userip_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -152,18 +227,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -399,7 +676,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -421,6 +698,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -441,14 +719,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -469,7 +752,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -482,9 +766,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_file_userip_acl$(EXEEXT): $(ext_file_userip_acl_OBJECTS) $(ext_file_userip_acl_DEPENDENCIES) + +ext_file_userip_acl$(EXEEXT): $(ext_file_userip_acl_OBJECTS) $(ext_file_userip_acl_DEPENDENCIES) $(EXTRA_ext_file_userip_acl_DEPENDENCIES) @rm -f ext_file_userip_acl$(EXEEXT) - $(CXXLINK) $(ext_file_userip_acl_OBJECTS) $(ext_file_userip_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_file_userip_acl_OBJECTS) $(ext_file_userip_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -495,25 +780,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_file_userip_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -522,11 +807,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -555,30 +847,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -590,15 +869,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -607,116 +882,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -765,11 +1106,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -856,21 +1205,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/kerberos_ldap_group/Makefile.in squid-3.4.4.1/helpers/external_acl/kerberos_ldap_group/Makefile.in --- squid-3.4.4/helpers/external_acl/kerberos_ldap_group/Makefile.in 2014-03-09 01:41:45.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/kerberos_ldap_group/Makefile.in 2014-04-23 05:51:10.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,7 +169,11 @@ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) -ext_kerberos_ldap_group_acl_LINK = $(LIBTOOL) --tag=CXX \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +ext_kerberos_ldap_group_acl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ext_kerberos_ldap_group_acl_LDFLAGS) $(LDFLAGS) -o $@ @@ -149,47 +198,281 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(ext_kerberos_ldap_group_acl_SOURCES) DIST_SOURCES = $(ext_kerberos_ldap_group_acl_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -221,6 +504,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -259,6 +543,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -276,6 +561,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -313,11 +599,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -376,6 +664,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -470,7 +759,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -492,6 +781,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -512,14 +802,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -540,7 +835,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -553,13 +849,17 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_kerberos_ldap_group_acl$(EXEEXT): $(ext_kerberos_ldap_group_acl_OBJECTS) $(ext_kerberos_ldap_group_acl_DEPENDENCIES) + +ext_kerberos_ldap_group_acl$(EXEEXT): $(ext_kerberos_ldap_group_acl_OBJECTS) $(ext_kerberos_ldap_group_acl_DEPENDENCIES) $(EXTRA_ext_kerberos_ldap_group_acl_DEPENDENCIES) @rm -f ext_kerberos_ldap_group_acl$(EXEEXT) - $(ext_kerberos_ldap_group_acl_LINK) $(ext_kerberos_ldap_group_acl_OBJECTS) $(ext_kerberos_ldap_group_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(ext_kerberos_ldap_group_acl_LINK) $(ext_kerberos_ldap_group_acl_OBJECTS) $(ext_kerberos_ldap_group_acl_LDADD) $(LIBS) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -587,9 +887,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -609,25 +907,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support_sasl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -636,22 +934,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -666,57 +967,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -732,12 +988,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -749,15 +1000,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -766,101 +1013,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -894,13 +1220,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -940,11 +1263,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1027,26 +1358,24 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-libexecSCRIPTS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS \ - uninstall-libexecSCRIPTS +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-libexecSCRIPTS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/LDAP_group/Makefile.in squid-3.4.4.1/helpers/external_acl/LDAP_group/Makefile.in --- squid-3.4.4/helpers/external_acl/LDAP_group/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/LDAP_group/Makefile.in 2014-04-23 05:51:08.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am ChangeLog +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver ChangeLog check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -117,21 +162,51 @@ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_ldap_group_acl_SOURCES) DIST_SOURCES = $(ext_ldap_group_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -153,18 +228,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -203,6 +475,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -220,6 +493,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -257,11 +531,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -320,6 +596,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -397,7 +674,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -419,6 +696,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -439,14 +717,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -467,7 +750,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -480,9 +764,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_ldap_group_acl$(EXEEXT): $(ext_ldap_group_acl_OBJECTS) $(ext_ldap_group_acl_DEPENDENCIES) + +ext_ldap_group_acl$(EXEEXT): $(ext_ldap_group_acl_OBJECTS) $(ext_ldap_group_acl_DEPENDENCIES) $(EXTRA_ext_ldap_group_acl_DEPENDENCIES) @rm -f ext_ldap_group_acl$(EXEEXT) - $(CXXLINK) $(ext_ldap_group_acl_OBJECTS) $(ext_ldap_group_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_ldap_group_acl_OBJECTS) $(ext_ldap_group_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -493,25 +778,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_ldap_group_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -520,11 +805,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -553,30 +845,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -588,15 +867,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -605,116 +880,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -763,11 +1104,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -854,21 +1203,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/LM_group/Makefile.in squid-3.4.4.1/helpers/external_acl/LM_group/Makefile.in --- squid-3.4.4/helpers/external_acl/LM_group/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/LM_group/Makefile.in 2014-04-23 05:51:08.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ am__DEPENDENCIES_3 = ext_lm_group_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_lm_group_acl_SOURCES) DIST_SOURCES = $(ext_lm_group_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +473,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +491,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +529,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +594,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -395,7 +672,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -417,6 +694,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -437,14 +715,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -465,7 +748,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -478,9 +762,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_lm_group_acl$(EXEEXT): $(ext_lm_group_acl_OBJECTS) $(ext_lm_group_acl_DEPENDENCIES) + +ext_lm_group_acl$(EXEEXT): $(ext_lm_group_acl_OBJECTS) $(ext_lm_group_acl_DEPENDENCIES) $(EXTRA_ext_lm_group_acl_DEPENDENCIES) @rm -f ext_lm_group_acl$(EXEEXT) - $(CXXLINK) $(ext_lm_group_acl_OBJECTS) $(ext_lm_group_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_lm_group_acl_OBJECTS) $(ext_lm_group_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -491,25 +776,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_lm_group_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -518,11 +803,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -551,30 +843,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -586,15 +865,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -603,116 +878,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -761,11 +1102,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -852,21 +1201,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/Makefile.in squid-3.4.4.1/helpers/external_acl/Makefile.in --- squid-3.4.4/helpers/external_acl/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/Makefile.in 2014-04-23 05:51:08.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/external_acl -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -408,22 +496,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -438,57 +529,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -504,12 +550,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -521,15 +562,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -538,6 +575,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -574,13 +626,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -615,10 +664,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -696,22 +750,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/external_acl/session/Makefile.in squid-3.4.4.1/helpers/external_acl/session/Makefile.in --- squid-3.4.4/helpers/external_acl/session/Makefile.in 2014-03-09 01:41:45.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/session/Makefile.in 2014-04-23 05:51:10.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ am__DEPENDENCIES_3 = ext_session_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_session_acl_SOURCES) DIST_SOURCES = $(ext_session_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +473,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +491,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +529,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +594,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -392,7 +669,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -414,6 +691,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -434,14 +712,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -462,7 +745,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -475,9 +759,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_session_acl$(EXEEXT): $(ext_session_acl_OBJECTS) $(ext_session_acl_DEPENDENCIES) + +ext_session_acl$(EXEEXT): $(ext_session_acl_OBJECTS) $(ext_session_acl_DEPENDENCIES) $(EXTRA_ext_session_acl_DEPENDENCIES) @rm -f ext_session_acl$(EXEEXT) - $(CXXLINK) $(ext_session_acl_OBJECTS) $(ext_session_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_session_acl_OBJECTS) $(ext_session_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -488,25 +773,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_session_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -515,11 +800,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -548,30 +840,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -583,15 +862,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -600,116 +875,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -758,11 +1099,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -849,21 +1198,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/SQL_session/ext_sql_session_acl.8 squid-3.4.4.1/helpers/external_acl/SQL_session/ext_sql_session_acl.8 --- squid-3.4.4/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2014-03-09 03:02:43.000000000 -0700 +++ squid-3.4.4.1/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2014-04-23 06:00:39.000000000 -0700 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_SQL_SESSION_ACL 1" -.TH EXT_SQL_SESSION_ACL 1 "2014-03-09" "perl v5.10.1" "User Contributed Perl Documentation" +.TH EXT_SQL_SESSION_ACL 1 "2014-04-23" "perl v5.18.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -141,12 +150,12 @@ Taking an identity token to be validated (as determined by the external_acl_type format) it returns a username or tag associated with the identity token passed in. .PP -Common forms of identifiers are \s-1IP\s0 address, \s-1EUI\s0 (\s-1MAC\s0) address, passwords, or \s-1UUID\s0 tokens. +Common forms of identifiers are \s-1IP\s0 address, \s-1EUI \s0(\s-1MAC\s0) address, passwords, or \s-1UUID\s0 tokens. .PP This program uses Squid concurrency support. .IP "\fB\-\-dsn\fR" 8 .IX Item "--dsn" -Database \s-1DSN\s0. Default \*(L"DBI:mysql:database=squid\*(R" +Database \s-1DSN.\s0 Default \*(L"DBI:mysql:database=squid\*(R" .IP "\fB\-\-user\fR" 8 .IX Item "--user" Database User diff -u -r -N squid-3.4.4/helpers/external_acl/SQL_session/Makefile.in squid-3.4.4.1/helpers/external_acl/SQL_session/Makefile.in --- squid-3.4.4/helpers/external_acl/SQL_session/Makefile.in 2014-03-09 01:41:44.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/SQL_session/Makefile.in 2014-04-23 05:51:08.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,20 +168,218 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +418,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +436,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +474,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +539,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -367,6 +614,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -388,6 +636,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,8 +657,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -437,9 +689,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -448,11 +698,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -481,122 +738,171 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: +ctags CTAGS: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -645,11 +951,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -733,18 +1047,18 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man \ - install-man8 install-pdf install-pdf-am install-ps \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-libexecSCRIPTS \ - uninstall-man uninstall-man8 + ps ps-am recheck tags-am uninstall uninstall-am \ + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/time_quota/Makefile.in squid-3.4.4.1/helpers/external_acl/time_quota/Makefile.in --- squid-3.4.4/helpers/external_acl/time_quota/Makefile.in 2014-03-09 01:41:45.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/time_quota/Makefile.in 2014-04-23 05:51:10.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,21 +160,51 @@ am__DEPENDENCIES_3 = ext_time_quota_acl_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_time_quota_acl_SOURCES) DIST_SOURCES = $(ext_time_quota_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -151,18 +226,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -393,7 +670,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -415,6 +692,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -435,14 +713,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -463,7 +746,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -476,9 +760,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_time_quota_acl$(EXEEXT): $(ext_time_quota_acl_OBJECTS) $(ext_time_quota_acl_DEPENDENCIES) + +ext_time_quota_acl$(EXEEXT): $(ext_time_quota_acl_OBJECTS) $(ext_time_quota_acl_DEPENDENCIES) $(EXTRA_ext_time_quota_acl_DEPENDENCIES) @rm -f ext_time_quota_acl$(EXEEXT) - $(CXXLINK) $(ext_time_quota_acl_OBJECTS) $(ext_time_quota_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_time_quota_acl_OBJECTS) $(ext_time_quota_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -489,25 +774,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext_time_quota_acl.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -516,11 +801,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -549,30 +841,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -584,15 +863,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -601,116 +876,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -759,11 +1100,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -850,21 +1199,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/unix_group/Makefile.in squid-3.4.4.1/helpers/external_acl/unix_group/Makefile.in --- squid-3.4.4/helpers/external_acl/unix_group/Makefile.in 2014-03-09 01:41:45.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/unix_group/Makefile.in 2014-04-23 05:51:11.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,21 +161,51 @@ ext_unix_group_acl_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ext_unix_group_acl_SOURCES) DIST_SOURCES = $(ext_unix_group_acl_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -152,18 +227,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -394,7 +671,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -416,6 +693,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -436,14 +714,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -464,7 +747,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -477,9 +761,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ext_unix_group_acl$(EXEEXT): $(ext_unix_group_acl_OBJECTS) $(ext_unix_group_acl_DEPENDENCIES) + +ext_unix_group_acl$(EXEEXT): $(ext_unix_group_acl_OBJECTS) $(ext_unix_group_acl_DEPENDENCIES) $(EXTRA_ext_unix_group_acl_DEPENDENCIES) @rm -f ext_unix_group_acl$(EXEEXT) - $(CXXLINK) $(ext_unix_group_acl_OBJECTS) $(ext_unix_group_acl_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ext_unix_group_acl_OBJECTS) $(ext_unix_group_acl_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -490,25 +775,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_group.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -517,11 +802,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -550,30 +842,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -585,15 +864,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -602,116 +877,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -760,11 +1101,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -851,21 +1200,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.4.4.1/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 --- squid-3.4.4/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2014-03-09 03:02:44.000000000 -0700 +++ squid-3.4.4.1/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2014-04-23 06:00:41.000000000 -0700 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1" -.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2014-03-09" "perl v5.10.1" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2014-04-23" "perl v5.18.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -174,8 +183,8 @@ .IX Header "COPYRIGHT" This program is put in the public domain by Jerry Murdock . It is distributed in the hope that it will -be useful, but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty -of \s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. +be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty +of \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 .SH "QUESTIONS" .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the diff -u -r -N squid-3.4.4/helpers/external_acl/wbinfo_group/Makefile.in squid-3.4.4.1/helpers/external_acl/wbinfo_group/Makefile.in --- squid-3.4.4/helpers/external_acl/wbinfo_group/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/external_acl/wbinfo_group/Makefile.in 2014-04-23 05:51:11.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,20 +168,218 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +418,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +436,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +474,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +539,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -364,6 +611,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -385,6 +633,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -405,8 +654,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -434,9 +686,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -445,11 +695,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -478,122 +735,171 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: +ctags CTAGS: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -642,11 +948,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -730,18 +1044,18 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man \ - install-man8 install-pdf install-pdf-am install-ps \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-libexecSCRIPTS \ - uninstall-man uninstall-man8 + ps ps-am recheck tags-am uninstall uninstall-am \ + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/log_daemon/DB/log_db_daemon.8 squid-3.4.4.1/helpers/log_daemon/DB/log_db_daemon.8 --- squid-3.4.4/helpers/log_daemon/DB/log_db_daemon.8 2014-03-09 03:02:45.000000000 -0700 +++ squid-3.4.4.1/helpers/log_daemon/DB/log_db_daemon.8 2014-04-23 06:00:43.000000000 -0700 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LOG_DB_DAEMON 1" -.TH LOG_DB_DAEMON 1 "2014-03-09" "perl v5.10.1" "User Contributed Perl Documentation" +.TH LOG_DB_DAEMON 1 "2014-04-23" "perl v5.18.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -235,7 +244,7 @@ \& FLUSH PRIVILEGES; .Ve .PP -Note that only \s-1CREATE\s0, \s-1INSERT\s0 and \s-1SELECT\s0 privileges are granted to the 'squid' user. This ensures that the logfile daemon script cannot change or modify the log entries. +Note that only \s-1CREATE, INSERT\s0 and \s-1SELECT\s0 privileges are granted to the 'squid' user. This ensures that the logfile daemon script cannot change or modify the log entries. .PP \fITable\fR .IX Subsection "Table" diff -u -r -N squid-3.4.4/helpers/log_daemon/DB/Makefile.in squid-3.4.4.1/helpers/log_daemon/DB/Makefile.in --- squid-3.4.4/helpers/log_daemon/DB/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/log_daemon/DB/Makefile.in 2014-04-23 05:51:11.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,20 +168,218 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +418,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +436,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +474,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +539,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -369,6 +616,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -390,6 +638,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -410,8 +659,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -439,9 +691,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -450,11 +700,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -483,122 +740,171 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: +ctags CTAGS: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -647,11 +953,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -735,18 +1049,18 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man \ - install-man8 install-pdf install-pdf-am install-ps \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-libexecSCRIPTS \ - uninstall-man uninstall-man8 + ps ps-am recheck tags-am uninstall uninstall-am \ + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/log_daemon/file/Makefile.in squid-3.4.4.1/helpers/log_daemon/file/Makefile.in --- squid-3.4.4/helpers/log_daemon/file/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/log_daemon/file/Makefile.in 2014-04-23 05:51:12.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -114,30 +159,278 @@ am__DEPENDENCIES_3 = log_file_daemon_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(log_file_daemon_SOURCES) DIST_SOURCES = $(log_file_daemon_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +469,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +487,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +525,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +590,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -366,7 +664,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -388,6 +686,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,14 +707,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -436,7 +740,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -449,9 +754,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -log_file_daemon$(EXEEXT): $(log_file_daemon_OBJECTS) $(log_file_daemon_DEPENDENCIES) + +log_file_daemon$(EXEEXT): $(log_file_daemon_OBJECTS) $(log_file_daemon_DEPENDENCIES) $(EXTRA_log_file_daemon_DEPENDENCIES) @rm -f log_file_daemon$(EXEEXT) - $(CXXLINK) $(log_file_daemon_OBJECTS) $(log_file_daemon_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(log_file_daemon_OBJECTS) $(log_file_daemon_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -462,25 +768,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_file_daemon.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -488,26 +794,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -519,15 +814,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -536,101 +827,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -681,11 +1051,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -770,20 +1148,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/log_daemon/Makefile.in squid-3.4.4.1/helpers/log_daemon/Makefile.in --- squid-3.4.4/helpers/log_daemon/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/log_daemon/Makefile.in 2014-04-23 05:51:12.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/log_daemon -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -400,22 +488,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -430,57 +521,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -496,12 +542,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -513,15 +554,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -530,6 +567,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -566,13 +618,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -607,10 +656,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -688,22 +742,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/Makefile.in squid-3.4.4.1/helpers/Makefile.in --- squid-3.4.4/helpers/Makefile.in 2014-03-09 01:41:39.000000000 -0800 +++ squid-3.4.4.1/helpers/Makefile.in 2014-04-23 05:51:00.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +80,7 @@ @ENABLE_AUTH_NTLM_TRUE@am__append_1 = ntlm_auth @ENABLE_SSL_TRUE@am__append_2 = ssl subdir = helpers -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -45,7 +89,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -100,20 +144,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -146,6 +228,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -184,6 +267,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -201,6 +285,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -238,11 +323,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -301,6 +388,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -411,22 +499,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -441,57 +532,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -507,12 +553,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -524,15 +565,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -541,6 +578,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -577,13 +629,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -618,10 +667,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -699,22 +753,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/negotiate_auth/kerberos/Makefile.am squid-3.4.4.1/helpers/negotiate_auth/kerberos/Makefile.am --- squid-3.4.4/helpers/negotiate_auth/kerberos/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/kerberos/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -12,6 +12,7 @@ negotiate_kerberos_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) @@ -20,6 +21,7 @@ negotiate_kerberos_auth_test_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/negotiate_auth/kerberos/Makefile.in squid-3.4.4.1/helpers/negotiate_auth/kerberos/Makefile.in --- squid-3.4.4/helpers/negotiate_auth/kerberos/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/kerberos/Makefile.in 2014-04-23 05:51:13.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am COPYING +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver COPYING README check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -118,55 +163,97 @@ am__DEPENDENCIES_3 = negotiate_kerberos_auth_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) -negotiate_kerberos_auth_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(negotiate_kerberos_auth_LDFLAGS) $(LDFLAGS) -o \ - $@ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +negotiate_kerberos_auth_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(negotiate_kerberos_auth_LDFLAGS) \ + $(LDFLAGS) -o $@ am_negotiate_kerberos_auth_test_OBJECTS = \ negotiate_kerberos_auth_test.$(OBJEXT) negotiate_kerberos_auth_test_OBJECTS = \ $(am_negotiate_kerberos_auth_test_OBJECTS) negotiate_kerberos_auth_test_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) -negotiate_kerberos_auth_test_LINK = $(LIBTOOL) --tag=CXX \ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +negotiate_kerberos_auth_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) \ $(negotiate_kerberos_auth_test_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(negotiate_kerberos_auth_SOURCES) \ $(negotiate_kerberos_auth_test_SOURCES) DIST_SOURCES = $(negotiate_kerberos_auth_SOURCES) \ $(negotiate_kerberos_auth_test_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -188,18 +275,216 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -231,6 +516,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -269,6 +555,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -286,6 +573,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -323,11 +611,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -386,6 +676,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -458,6 +749,7 @@ negotiate_kerberos_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) @@ -466,6 +758,7 @@ negotiate_kerberos_auth_test_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) @@ -473,7 +766,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -495,6 +788,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -515,14 +809,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -543,7 +842,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -556,12 +856,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -negotiate_kerberos_auth$(EXEEXT): $(negotiate_kerberos_auth_OBJECTS) $(negotiate_kerberos_auth_DEPENDENCIES) + +negotiate_kerberos_auth$(EXEEXT): $(negotiate_kerberos_auth_OBJECTS) $(negotiate_kerberos_auth_DEPENDENCIES) $(EXTRA_negotiate_kerberos_auth_DEPENDENCIES) @rm -f negotiate_kerberos_auth$(EXEEXT) - $(negotiate_kerberos_auth_LINK) $(negotiate_kerberos_auth_OBJECTS) $(negotiate_kerberos_auth_LDADD) $(LIBS) -negotiate_kerberos_auth_test$(EXEEXT): $(negotiate_kerberos_auth_test_OBJECTS) $(negotiate_kerberos_auth_test_DEPENDENCIES) + $(AM_V_CXXLD)$(negotiate_kerberos_auth_LINK) $(negotiate_kerberos_auth_OBJECTS) $(negotiate_kerberos_auth_LDADD) $(LIBS) + +negotiate_kerberos_auth_test$(EXEEXT): $(negotiate_kerberos_auth_test_OBJECTS) $(negotiate_kerberos_auth_test_DEPENDENCIES) $(EXTRA_negotiate_kerberos_auth_test_DEPENDENCIES) @rm -f negotiate_kerberos_auth_test$(EXEEXT) - $(negotiate_kerberos_auth_test_LINK) $(negotiate_kerberos_auth_test_OBJECTS) $(negotiate_kerberos_auth_test_LDADD) $(LIBS) + $(AM_V_CXXLD)$(negotiate_kerberos_auth_test_LINK) $(negotiate_kerberos_auth_test_OBJECTS) $(negotiate_kerberos_auth_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -574,25 +876,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negotiate_kerberos_pac.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -601,11 +903,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -634,27 +943,28 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -669,57 +979,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -735,12 +1000,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -752,15 +1012,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -769,116 +1025,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -910,13 +1232,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -956,11 +1275,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1045,24 +1372,23 @@ uninstall-man: uninstall-man8 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-man8 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 diff -u -r -N squid-3.4.4/helpers/negotiate_auth/Makefile.in squid-3.4.4.1/helpers/negotiate_auth/Makefile.in --- squid-3.4.4/helpers/negotiate_auth/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/Makefile.in 2014-04-23 05:51:12.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/negotiate_auth -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -396,22 +484,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -426,57 +517,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -492,12 +538,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -509,15 +550,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -526,6 +563,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -562,13 +614,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -603,10 +652,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -684,22 +738,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/negotiate_auth/SSPI/Makefile.in squid-3.4.4.1/helpers/negotiate_auth/SSPI/Makefile.in --- squid-3.4.4/helpers/negotiate_auth/SSPI/Makefile.in 2014-03-09 01:41:46.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/SSPI/Makefile.in 2014-04-23 05:51:13.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,30 +160,278 @@ am__DEPENDENCIES_3 = negotiate_sspi_auth_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(negotiate_sspi_auth_SOURCES) DIST_SOURCES = $(negotiate_sspi_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +470,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +488,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +526,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +591,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -369,7 +667,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,6 +689,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -411,14 +710,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -439,7 +743,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -452,9 +757,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -negotiate_sspi_auth$(EXEEXT): $(negotiate_sspi_auth_OBJECTS) $(negotiate_sspi_auth_DEPENDENCIES) + +negotiate_sspi_auth$(EXEEXT): $(negotiate_sspi_auth_OBJECTS) $(negotiate_sspi_auth_DEPENDENCIES) $(EXTRA_negotiate_sspi_auth_DEPENDENCIES) @rm -f negotiate_sspi_auth$(EXEEXT) - $(CXXLINK) $(negotiate_sspi_auth_OBJECTS) $(negotiate_sspi_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(negotiate_sspi_auth_OBJECTS) $(negotiate_sspi_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -465,25 +771,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negotiate_sspi_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -491,26 +797,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -522,15 +817,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -539,101 +830,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -684,11 +1054,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -773,20 +1151,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/negotiate_auth/wrapper/Makefile.am squid-3.4.4.1/helpers/negotiate_auth/wrapper/Makefile.am --- squid-3.4.4/helpers/negotiate_auth/wrapper/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/wrapper/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -8,4 +8,5 @@ negotiate_wrapper_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/negotiate_auth/wrapper/Makefile.in squid-3.4.4.1/helpers/negotiate_auth/wrapper/Makefile.in --- squid-3.4.4/helpers/negotiate_auth/wrapper/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/negotiate_auth/wrapper/Makefile.in 2014-04-23 05:51:13.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -114,31 +159,279 @@ am__DEPENDENCIES_3 = negotiate_wrapper_auth_DEPENDENCIES = \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(negotiate_wrapper_auth_SOURCES) DIST_SOURCES = $(negotiate_wrapper_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +470,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +488,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +526,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +591,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -363,12 +661,13 @@ negotiate_wrapper_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(XTRA_LIBS) all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -390,6 +689,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -410,14 +710,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -438,7 +743,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -451,9 +757,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -negotiate_wrapper_auth$(EXEEXT): $(negotiate_wrapper_auth_OBJECTS) $(negotiate_wrapper_auth_DEPENDENCIES) + +negotiate_wrapper_auth$(EXEEXT): $(negotiate_wrapper_auth_OBJECTS) $(negotiate_wrapper_auth_DEPENDENCIES) $(EXTRA_negotiate_wrapper_auth_DEPENDENCIES) @rm -f negotiate_wrapper_auth$(EXEEXT) - $(CXXLINK) $(negotiate_wrapper_auth_OBJECTS) $(negotiate_wrapper_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(negotiate_wrapper_auth_OBJECTS) $(negotiate_wrapper_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -464,25 +771,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negotiate_wrapper.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -490,26 +797,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -521,15 +817,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -538,101 +830,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -683,11 +1054,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -772,20 +1151,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/ntlm_auth/fake/Makefile.am squid-3.4.4.1/helpers/ntlm_auth/fake/Makefile.am --- squid-3.4.4/helpers/ntlm_auth/fake/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/fake/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -7,6 +7,7 @@ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/ntlm_auth/fake/Makefile.in squid-3.4.4.1/helpers/ntlm_auth/fake/Makefile.in --- squid-3.4.4/helpers/ntlm_auth/fake/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/fake/Makefile.in 2014-04-23 05:51:14.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,31 +160,280 @@ ntlm_fake_auth_DEPENDENCIES = \ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ntlm_fake_auth_SOURCES) DIST_SOURCES = $(ntlm_fake_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +472,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +490,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +528,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +593,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -365,6 +664,7 @@ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(XTRA_LIBS) @@ -374,7 +674,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -396,6 +696,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -416,14 +717,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -444,7 +750,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -457,9 +764,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntlm_fake_auth$(EXEEXT): $(ntlm_fake_auth_OBJECTS) $(ntlm_fake_auth_DEPENDENCIES) + +ntlm_fake_auth$(EXEEXT): $(ntlm_fake_auth_OBJECTS) $(ntlm_fake_auth_DEPENDENCIES) $(EXTRA_ntlm_fake_auth_DEPENDENCIES) @rm -f ntlm_fake_auth$(EXEEXT) - $(CXXLINK) $(ntlm_fake_auth_OBJECTS) $(ntlm_fake_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ntlm_fake_auth_OBJECTS) $(ntlm_fake_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -470,25 +778,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm_fake_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -496,26 +804,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -527,15 +824,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -544,101 +837,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -689,11 +1061,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -778,20 +1158,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/ntlm_auth/Makefile.in squid-3.4.4.1/helpers/ntlm_auth/Makefile.in --- squid-3.4.4/helpers/ntlm_auth/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/Makefile.in 2014-04-23 05:51:14.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/ntlm_auth -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -397,22 +485,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -427,57 +518,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -493,12 +539,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -510,15 +551,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -527,6 +564,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -563,13 +615,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -604,10 +653,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -685,22 +739,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/ntlm_auth/smb_lm/Makefile.am squid-3.4.4.1/helpers/ntlm_auth/smb_lm/Makefile.am --- squid-3.4.4/helpers/ntlm_auth/smb_lm/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/smb_lm/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -9,6 +9,7 @@ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/helpers/ntlm_auth/smb_lm/Makefile.in squid-3.4.4.1/helpers/ntlm_auth/smb_lm/Makefile.in --- squid-3.4.4/helpers/ntlm_auth/smb_lm/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/smb_lm/Makefile.in 2014-04-23 05:51:15.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -117,31 +162,280 @@ $(top_builddir)/lib/rfcnb/librfcnb.la \ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ntlm_smb_lm_auth_SOURCES) DIST_SOURCES = $(ntlm_smb_lm_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -180,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -197,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -234,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -297,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -369,6 +668,7 @@ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(XTRA_LIBS) @@ -376,7 +676,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -398,6 +698,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -418,14 +719,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -446,7 +752,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -459,9 +766,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntlm_smb_lm_auth$(EXEEXT): $(ntlm_smb_lm_auth_OBJECTS) $(ntlm_smb_lm_auth_DEPENDENCIES) + +ntlm_smb_lm_auth$(EXEEXT): $(ntlm_smb_lm_auth_OBJECTS) $(ntlm_smb_lm_auth_DEPENDENCIES) $(EXTRA_ntlm_smb_lm_auth_DEPENDENCIES) @rm -f ntlm_smb_lm_auth$(EXEEXT) - $(CXXLINK) $(ntlm_smb_lm_auth_OBJECTS) $(ntlm_smb_lm_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ntlm_smb_lm_auth_OBJECTS) $(ntlm_smb_lm_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -472,25 +780,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm_smb_lm_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -498,26 +806,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -529,15 +826,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -546,101 +839,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -691,11 +1063,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -780,20 +1160,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/ntlm_auth/SSPI/Makefile.in squid-3.4.4.1/helpers/ntlm_auth/SSPI/Makefile.in --- squid-3.4.4/helpers/ntlm_auth/SSPI/Makefile.in 2014-03-09 01:41:47.000000000 -0800 +++ squid-3.4.4.1/helpers/ntlm_auth/SSPI/Makefile.in 2014-04-23 05:51:14.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -116,21 +161,51 @@ ntlm_sspi_auth_DEPENDENCIES = \ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ntlm_sspi_auth_SOURCES) DIST_SOURCES = $(ntlm_sspi_auth_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -152,18 +227,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +474,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +492,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +530,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +595,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -397,7 +674,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -419,6 +696,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -439,14 +717,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -467,7 +750,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -480,9 +764,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntlm_sspi_auth$(EXEEXT): $(ntlm_sspi_auth_OBJECTS) $(ntlm_sspi_auth_DEPENDENCIES) + +ntlm_sspi_auth$(EXEEXT): $(ntlm_sspi_auth_OBJECTS) $(ntlm_sspi_auth_DEPENDENCIES) $(EXTRA_ntlm_sspi_auth_DEPENDENCIES) @rm -f ntlm_sspi_auth$(EXEEXT) - $(CXXLINK) $(ntlm_sspi_auth_OBJECTS) $(ntlm_sspi_auth_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ntlm_sspi_auth_OBJECTS) $(ntlm_sspi_auth_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -493,25 +778,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm_sspi_auth.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -520,11 +805,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -553,30 +845,17 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -588,15 +867,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -605,116 +880,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -763,11 +1104,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -854,21 +1203,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libexecPROGRAMS uninstall-man \ - uninstall-man8 + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/ssl/Makefile.in squid-3.4.4.1/helpers/ssl/Makefile.in --- squid-3.4.4/helpers/ssl/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/helpers/ssl/Makefile.in 2014-04-23 05:51:15.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,17 +168,215 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -173,6 +415,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -190,6 +433,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -227,11 +471,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -290,6 +536,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -361,6 +608,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -382,6 +630,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -402,8 +651,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -431,113 +683,175 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: +cscope cscopelist: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -588,11 +902,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -674,16 +996,17 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS diff -u -r -N squid-3.4.4/helpers/storeid_rewrite/file/Makefile.in squid-3.4.4.1/helpers/storeid_rewrite/file/Makefile.in --- squid-3.4.4/helpers/storeid_rewrite/file/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/helpers/storeid_rewrite/file/Makefile.in 2014-04-23 05:51:16.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -124,20 +168,218 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -176,6 +418,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -193,6 +436,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -230,11 +474,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -293,6 +539,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -367,6 +614,7 @@ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -388,6 +636,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,8 +657,11 @@ rm -f $$list install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -437,9 +689,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -448,11 +698,18 @@ -rm -rf .libs _libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -481,122 +738,171 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: +ctags CTAGS: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -645,11 +951,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -733,18 +1047,18 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecSCRIPTS install-man \ - install-man8 install-pdf install-pdf-am install-ps \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags-am distclean distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecSCRIPTS \ + install-man install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-libexecSCRIPTS \ - uninstall-man uninstall-man8 + ps ps-am recheck tags-am uninstall uninstall-am \ + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/helpers/storeid_rewrite/file/storeid_file_rewrite.8 squid-3.4.4.1/helpers/storeid_rewrite/file/storeid_file_rewrite.8 --- squid-3.4.4/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2014-03-09 03:02:52.000000000 -0700 +++ squid-3.4.4.1/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2014-04-23 06:00:53.000000000 -0700 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "STOREID_FILE_REWRITE 1" -.TH STOREID_FILE_REWRITE 1 "2014-03-09" "perl v5.10.1" "User Contributed Perl Documentation" +.TH STOREID_FILE_REWRITE 1 "2014-04-23" "perl v5.18.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -161,10 +170,10 @@ (at your option) any later version. .PP This program is distributed in the hope that it will be useful, -but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of -\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the +but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of +\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the \&\s-1GNU\s0 General Public License for more details. .PP You should have received a copy of the \s-1GNU\s0 General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, \s-1MA\s0 02111\-1307, \s-1USA\s0. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, \s-1MA 02111\-1307, USA.\s0 diff -u -r -N squid-3.4.4/helpers/storeid_rewrite/Makefile.in squid-3.4.4.1/helpers/storeid_rewrite/Makefile.in --- squid-3.4.4/helpers/storeid_rewrite/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/helpers/storeid_rewrite/Makefile.in 2014-04-23 05:51:15.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/storeid_rewrite -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -396,22 +484,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -426,57 +517,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -492,12 +538,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -509,15 +550,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -526,6 +563,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -562,13 +614,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -603,10 +652,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -684,22 +738,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/helpers/url_rewrite/fake/Makefile.in squid-3.4.4.1/helpers/url_rewrite/fake/Makefile.in --- squid-3.4.4/helpers/url_rewrite/fake/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/helpers/url_rewrite/fake/Makefile.in 2014-04-23 05:51:16.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -113,6 +158,10 @@ am__DEPENDENCIES_2 = $(top_builddir)/compat/libcompat-squid.la \ $(am__DEPENDENCIES_1) url_fake_rewrite_DEPENDENCIES = $(am__DEPENDENCIES_2) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -134,31 +183,254 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(url_fake_rewrite_SOURCES) DIST_SOURCES = $(url_fake_rewrite_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -197,6 +469,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -214,6 +487,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -251,11 +525,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -314,6 +590,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -385,7 +662,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -407,6 +684,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -427,14 +705,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -455,7 +738,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -468,13 +752,17 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -url_fake_rewrite$(EXEEXT): $(url_fake_rewrite_OBJECTS) $(url_fake_rewrite_DEPENDENCIES) + +url_fake_rewrite$(EXEEXT): $(url_fake_rewrite_OBJECTS) $(url_fake_rewrite_DEPENDENCIES) $(EXTRA_url_fake_rewrite_DEPENDENCIES) @rm -f url_fake_rewrite$(EXEEXT) - $(CXXLINK) $(url_fake_rewrite_OBJECTS) $(url_fake_rewrite_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(url_fake_rewrite_OBJECTS) $(url_fake_rewrite_LDADD) $(LIBS) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -502,9 +790,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -515,25 +801,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -541,26 +827,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -572,15 +847,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -589,101 +860,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -734,11 +1084,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -823,20 +1181,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-libexecSCRIPTS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-libexecSCRIPTS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS \ uninstall-libexecSCRIPTS diff -u -r -N squid-3.4.4/helpers/url_rewrite/Makefile.in squid-3.4.4.1/helpers/url_rewrite/Makefile.in --- squid-3.4.4/helpers/url_rewrite/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/helpers/url_rewrite/Makefile.in 2014-04-23 05:51:16.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/url_rewrite -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -43,7 +87,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -98,20 +142,58 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -144,6 +226,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +265,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +283,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +321,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +386,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -396,22 +484,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -426,57 +517,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -492,12 +538,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -509,15 +550,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -526,6 +563,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -562,13 +614,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -603,10 +652,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -684,22 +738,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/icons/Makefile.in squid-3.4.4.1/icons/Makefile.in --- squid-3.4.4/icons/Makefile.in 2014-03-09 01:41:48.000000000 -0800 +++ squid-3.4.4.1/icons/Makefile.in 2014-04-23 05:51:16.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/icons/list +DIST_COMMON = $(top_srcdir)/icons/list $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ @@ -45,7 +89,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -100,8 +144,25 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -123,13 +184,21 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -168,6 +237,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -185,6 +255,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -222,11 +293,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -285,6 +358,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -419,6 +493,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/icons/list: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -436,8 +511,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -451,14 +529,12 @@ @$(NORMAL_UNINSTALL) @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icondir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -508,10 +584,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -593,17 +674,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-iconDATA \ - uninstall-local + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-iconDATA \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-iconDATA uninstall-local install-data-local: SN.png install-iconDATA diff -u -r -N squid-3.4.4/include/autoconf.h.in squid-3.4.4.1/include/autoconf.h.in --- squid-3.4.4/include/autoconf.h.in 2014-03-09 01:41:31.000000000 -0800 +++ squid-3.4.4.1/include/autoconf.h.in 2014-04-23 05:50:39.000000000 -0700 @@ -173,6 +173,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CTYPE_H +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + /* Define to 1 if you have the header file. */ #undef HAVE_DB_185_H @@ -660,6 +663,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_TCP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_MD5_H + /* Define to 1 if you have the header file. */ #undef HAVE_NET_IF_ARP_H @@ -804,9 +810,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SASL_SASL_H -/* Define to 1 if you have the `sbrk' function. */ -#undef HAVE_SBRK - /* Define to 1 if you have the `sched_getaffinity' function. */ #undef HAVE_SCHED_GETAFFINITY @@ -905,9 +908,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDBOOL_H -/* Define if g++ supports C++0x features. */ -#undef HAVE_STDCXX_0X - /* Define to 1 if you have the header file. */ #undef HAVE_STDDEF_H @@ -1186,6 +1186,9 @@ /* The archive extension */ #undef LT_LIBEXT +/* The archive prefix */ +#undef LT_LIBPREFIX + /* Define to the extension used for runtime loadable modules, say, ".so". */ #undef LT_MODULE_EXT @@ -1197,6 +1200,9 @@ */ #undef LT_OBJDIR +/* Define to the shared library suffix, say, ".dylib". */ +#undef LT_SHARED_EXT + /* If MAXPATHLEN has not been defined */ #undef MAXPATHLEN @@ -1206,9 +1212,6 @@ /* Define if dlsym() requires a leading underscore in symbol names. */ #undef NEED_USCORE -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -1406,11 +1409,6 @@ /* Enable support for /dev/pf NAT lookups */ #undef USE_NAT_DEVPF -/* Define this to make use of the OpenSSL libraries for MD5 calculation rather - than Squid-supplied MD5 implementation or if building with SSL encryption - */ -#undef USE_OPENSSL - /* Use poll() for the IO loop */ #undef USE_POLL diff -u -r -N squid-3.4.4/include/md5.h squid-3.4.4.1/include/md5.h --- squid-3.4.4/include/md5.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/include/md5.h 2014-04-23 05:50:18.000000000 -0700 @@ -1,6 +1,18 @@ #ifndef SQUID_MD5_H #define SQUID_MD5_H +#if HAVE_NETTLE_MD5_H +#include + +typedef struct md5_ctx SquidMD5_CTX; + +#define SquidMD5Init(c) md5_init((c)) +#define SquidMD5Update(c,b,l) md5_update((c), (l), (const uint8_t *)(b)) +#define SquidMD5Final(d,c) md5_digest((c), MD5_DIGEST_SIZE, (uint8_t *)(d)) + +#define SQUID_MD5_DIGEST_LENGTH MD5_DIGEST_SIZE + +#else /* * This is the header file for the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was @@ -45,4 +57,6 @@ #define SQUID_MD5_DIGEST_LENGTH 16 +#endif /* HAVE_NETTLE_MD5_H */ + #endif /* SQUID_MD5_H */ diff -u -r -N squid-3.4.4/include/squid.h squid-3.4.4.1/include/squid.h --- squid-3.4.4/include/squid.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/include/squid.h 2014-04-23 05:50:18.000000000 -0700 @@ -103,11 +103,7 @@ /* * Determine if this is a leak check build or standard */ -#if PURIFY -#define LEAK_CHECK_MODE 1 -#elif WITH_VALGRIND -#define LEAK_CHECK_MODE 1 -#elif XMALLOC_TRACE +#if PURIFY || WITH_VALGRIND #define LEAK_CHECK_MODE 1 #endif diff -u -r -N squid-3.4.4/include/util.h squid-3.4.4.1/include/util.h --- squid-3.4.4/include/util.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/include/util.h 2014-04-23 05:50:18.000000000 -0700 @@ -63,20 +63,6 @@ #include "SquidNew.h" #endif -#if XMALLOC_TRACE -#define xmalloc(size) (xmalloc_func="xmalloc",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xmalloc(size)) -#define xfree(ptr) (xmalloc_func="xfree",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xfree(ptr)) -#define xrealloc(ptr,size) (xmalloc_func="xrealloc",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xrealloc(ptr,size)) -#define xcalloc(n,size) (xmalloc_func="xcalloc",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xcalloc(n,size)) -#define xstrdup(ptr) (xmalloc_func="xstrdup",xmalloc_line=__LINE__,xmalloc_file=__FILE__,xstrdup(ptr)) -extern int xmalloc_line; -extern char *xmalloc_file; -extern char *xmalloc_func; -extern int xmalloc_trace; -extern size_t xmalloc_total; -extern void xmalloc_find_leaks(void); -#endif - SQUIDCEXTERN time_t parse_iso3307_time(const char *buf); SQUIDCEXTERN double xpercent(double part, double whole); diff -u -r -N squid-3.4.4/include/version.h squid-3.4.4.1/include/version.h --- squid-3.4.4/include/version.h 2014-03-09 01:42:04.000000000 -0800 +++ squid-3.4.4.1/include/version.h 2014-04-23 05:51:46.000000000 -0700 @@ -7,7 +7,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1394358053 +#define SQUID_RELEASE_TIME 1398257411 #endif #ifndef APP_SHORTNAME diff -u -r -N squid-3.4.4/lib/libTrie/Makefile.in squid-3.4.4.1/lib/libTrie/Makefile.in --- squid-3.4.4/lib/libTrie/Makefile.in 2014-03-09 01:41:49.000000000 -0800 +++ squid-3.4.4.1/lib/libTrie/Makefile.in 2014-04-23 05:51:17.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,10 +79,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am AUTHORS COPYING ChangeLog \ - INSTALL NEWS +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(noinst_HEADERS) $(top_srcdir)/cfgaux/test-driver AUTHORS \ + COPYING ChangeLog INSTALL NEWS README check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/libTrie @@ -50,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,51 +152,316 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libTrie_a_AR = $(AR) $(ARFLAGS) libTrie_a_LIBADD = am_libTrie_a_OBJECTS = Trie.$(OBJEXT) TrieNode.$(OBJEXT) libTrie_a_OBJECTS = $(am_libTrie_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libTrie_a_SOURCES) DIST_SOURCES = $(libTrie_a_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -182,6 +492,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -220,6 +531,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -237,6 +549,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -274,11 +587,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -337,6 +652,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -417,7 +733,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -439,6 +755,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -451,10 +768,11 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libTrie.a: $(libTrie_a_OBJECTS) $(libTrie_a_DEPENDENCIES) - -rm -f libTrie.a - $(libTrie_a_AR) libTrie.a $(libTrie_a_OBJECTS) $(libTrie_a_LIBADD) - $(RANLIB) libTrie.a + +libTrie.a: $(libTrie_a_OBJECTS) $(libTrie_a_DEPENDENCIES) $(EXTRA_libTrie_a_DEPENDENCIES) + $(AM_V_at)-rm -f libTrie.a + $(AM_V_AR)$(libTrie_a_AR) libTrie.a $(libTrie_a_OBJECTS) $(libTrie_a_LIBADD) + $(AM_V_at)$(RANLIB) libTrie.a clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -475,25 +793,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrieNode.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -502,22 +820,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -532,57 +853,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -598,12 +874,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -615,15 +886,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -632,101 +899,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -760,13 +1113,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -803,11 +1153,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -890,24 +1248,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/libTrie/test/Makefile.in squid-3.4.4.1/lib/libTrie/test/Makefile.in --- squid-3.4.4/lib/libTrie/test/Makefile.in 2014-03-09 01:41:49.000000000 -0800 +++ squid-3.4.4.1/lib/libTrie/test/Makefile.in 2014-04-23 05:51:18.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,8 +77,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = trie$(EXEEXT) TESTS = trie$(EXEEXT) @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -47,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -105,30 +150,280 @@ am_trie_OBJECTS = trie.$(OBJEXT) trie_OBJECTS = $(am_trie_OBJECTS) trie_DEPENDENCIES = $(top_builddir)/lib/libTrie/libTrie.a +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(trie_SOURCES) DIST_SOURCES = $(trie_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -167,6 +462,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -184,6 +480,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -221,11 +518,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -284,6 +583,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -354,7 +654,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -376,6 +676,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -394,9 +695,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -trie$(EXEEXT): $(trie_OBJECTS) $(trie_DEPENDENCIES) + +trie$(EXEEXT): $(trie_OBJECTS) $(trie_DEPENDENCIES) $(EXTRA_trie_DEPENDENCIES) @rm -f trie$(EXEEXT) - $(CXXLINK) $(trie_OBJECTS) $(trie_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(trie_OBJECTS) $(trie_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -407,25 +709,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trie.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -433,26 +735,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -464,15 +755,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -481,101 +768,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +trie.log: trie$(EXEEXT) + @p='trie$(EXEEXT)'; \ + b='trie'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -623,11 +996,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -712,9 +1093,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -724,7 +1105,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/Makefile.in squid-3.4.4.1/lib/Makefile.in --- squid-3.4.4/lib/Makefile.in 2014-03-09 01:41:49.000000000 -0800 +++ squid-3.4.4.1/lib/Makefile.in 2014-04-23 05:51:17.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = tests/testAll$(EXEEXT) TESTS = tests/testAll$(EXEEXT) testHeaders @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -59,7 +104,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -118,6 +163,10 @@ libmisccontainers_la_LIBADD = am_libmisccontainers_la_OBJECTS = hash.lo libmisccontainers_la_OBJECTS = $(am_libmisccontainers_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libmiscencoding_la_LIBADD = am_libmiscencoding_la_OBJECTS = base64.lo charset.lo html_quote.lo \ md5.lo rfc1738.lo rfc2617.lo uudecode.lo @@ -143,32 +192,63 @@ tests_testAll_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_3) -tests_testAll_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testAll_LDFLAGS) $(LDFLAGS) -o $@ +tests_testAll_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testAll_LDFLAGS) $(LDFLAGS) \ + -o $@ am__dirstamp = $(am__leading_dot)dirstamp +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libmisccontainers_la_SOURCES) \ $(libmiscencoding_la_SOURCES) $(libmiscutil_la_SOURCES) \ $(EXTRA_libmiscutil_la_SOURCES) $(libsspwin32_la_SOURCES) \ @@ -177,22 +257,249 @@ $(libmiscencoding_la_SOURCES) $(libmiscutil_la_SOURCES) \ $(EXTRA_libmiscutil_la_SOURCES) \ $(am__libsspwin32_la_SOURCES_DIST) $(tests_testAll_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -223,6 +530,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -261,6 +569,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -278,6 +587,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -315,11 +625,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -378,6 +690,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -506,7 +819,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .cc .lo .o .obj +.SUFFIXES: .c .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -528,6 +841,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -540,20 +854,26 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libmisccontainers.la: $(libmisccontainers_la_OBJECTS) $(libmisccontainers_la_DEPENDENCIES) - $(CXXLINK) $(libmisccontainers_la_OBJECTS) $(libmisccontainers_la_LIBADD) $(LIBS) -libmiscencoding.la: $(libmiscencoding_la_OBJECTS) $(libmiscencoding_la_DEPENDENCIES) - $(LINK) $(libmiscencoding_la_OBJECTS) $(libmiscencoding_la_LIBADD) $(LIBS) -libmiscutil.la: $(libmiscutil_la_OBJECTS) $(libmiscutil_la_DEPENDENCIES) - $(CXXLINK) $(libmiscutil_la_OBJECTS) $(libmiscutil_la_LIBADD) $(LIBS) -libsspwin32.la: $(libsspwin32_la_OBJECTS) $(libsspwin32_la_DEPENDENCIES) - $(CXXLINK) $(am_libsspwin32_la_rpath) $(libsspwin32_la_OBJECTS) $(libsspwin32_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmisccontainers.la: $(libmisccontainers_la_OBJECTS) $(libmisccontainers_la_DEPENDENCIES) $(EXTRA_libmisccontainers_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libmisccontainers_la_OBJECTS) $(libmisccontainers_la_LIBADD) $(LIBS) + +libmiscencoding.la: $(libmiscencoding_la_OBJECTS) $(libmiscencoding_la_DEPENDENCIES) $(EXTRA_libmiscencoding_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libmiscencoding_la_OBJECTS) $(libmiscencoding_la_LIBADD) $(LIBS) + +libmiscutil.la: $(libmiscutil_la_OBJECTS) $(libmiscutil_la_DEPENDENCIES) $(EXTRA_libmiscutil_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libmiscutil_la_OBJECTS) $(libmiscutil_la_LIBADD) $(LIBS) + +libsspwin32.la: $(libsspwin32_la_OBJECTS) $(libsspwin32_la_DEPENDENCIES) $(EXTRA_libsspwin32_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libsspwin32_la_rpath) $(libsspwin32_la_OBJECTS) $(libsspwin32_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -566,9 +886,10 @@ tests/$(am__dirstamp): @$(MKDIR_P) tests @: > tests/$(am__dirstamp) -tests/testAll$(EXEEXT): $(tests_testAll_OBJECTS) $(tests_testAll_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testAll$(EXEEXT): $(tests_testAll_OBJECTS) $(tests_testAll_DEPENDENCIES) $(EXTRA_tests_testAll_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testAll$(EXEEXT) - $(tests_testAll_LINK) $(tests_testAll_OBJECTS) $(tests_testAll_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testAll_LINK) $(tests_testAll_OBJECTS) $(tests_testAll_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -609,88 +930,88 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xusleep.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< testRFC1035.o: tests/testRFC1035.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1035.o -MD -MP -MF $(DEPDIR)/testRFC1035.Tpo -c -o testRFC1035.o `test -f 'tests/testRFC1035.cc' || echo '$(srcdir)/'`tests/testRFC1035.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testRFC1035.Tpo $(DEPDIR)/testRFC1035.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testRFC1035.cc' object='testRFC1035.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1035.o -MD -MP -MF $(DEPDIR)/testRFC1035.Tpo -c -o testRFC1035.o `test -f 'tests/testRFC1035.cc' || echo '$(srcdir)/'`tests/testRFC1035.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testRFC1035.Tpo $(DEPDIR)/testRFC1035.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testRFC1035.cc' object='testRFC1035.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1035.o `test -f 'tests/testRFC1035.cc' || echo '$(srcdir)/'`tests/testRFC1035.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1035.o `test -f 'tests/testRFC1035.cc' || echo '$(srcdir)/'`tests/testRFC1035.cc testRFC1035.obj: tests/testRFC1035.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1035.obj -MD -MP -MF $(DEPDIR)/testRFC1035.Tpo -c -o testRFC1035.obj `if test -f 'tests/testRFC1035.cc'; then $(CYGPATH_W) 'tests/testRFC1035.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1035.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testRFC1035.Tpo $(DEPDIR)/testRFC1035.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testRFC1035.cc' object='testRFC1035.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1035.obj -MD -MP -MF $(DEPDIR)/testRFC1035.Tpo -c -o testRFC1035.obj `if test -f 'tests/testRFC1035.cc'; then $(CYGPATH_W) 'tests/testRFC1035.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1035.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testRFC1035.Tpo $(DEPDIR)/testRFC1035.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testRFC1035.cc' object='testRFC1035.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1035.obj `if test -f 'tests/testRFC1035.cc'; then $(CYGPATH_W) 'tests/testRFC1035.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1035.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1035.obj `if test -f 'tests/testRFC1035.cc'; then $(CYGPATH_W) 'tests/testRFC1035.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1035.cc'; fi` testRFC1738.o: tests/testRFC1738.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1738.o -MD -MP -MF $(DEPDIR)/testRFC1738.Tpo -c -o testRFC1738.o `test -f 'tests/testRFC1738.cc' || echo '$(srcdir)/'`tests/testRFC1738.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testRFC1738.Tpo $(DEPDIR)/testRFC1738.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testRFC1738.cc' object='testRFC1738.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1738.o -MD -MP -MF $(DEPDIR)/testRFC1738.Tpo -c -o testRFC1738.o `test -f 'tests/testRFC1738.cc' || echo '$(srcdir)/'`tests/testRFC1738.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testRFC1738.Tpo $(DEPDIR)/testRFC1738.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testRFC1738.cc' object='testRFC1738.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1738.o `test -f 'tests/testRFC1738.cc' || echo '$(srcdir)/'`tests/testRFC1738.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1738.o `test -f 'tests/testRFC1738.cc' || echo '$(srcdir)/'`tests/testRFC1738.cc testRFC1738.obj: tests/testRFC1738.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1738.obj -MD -MP -MF $(DEPDIR)/testRFC1738.Tpo -c -o testRFC1738.obj `if test -f 'tests/testRFC1738.cc'; then $(CYGPATH_W) 'tests/testRFC1738.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1738.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testRFC1738.Tpo $(DEPDIR)/testRFC1738.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testRFC1738.cc' object='testRFC1738.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1738.obj -MD -MP -MF $(DEPDIR)/testRFC1738.Tpo -c -o testRFC1738.obj `if test -f 'tests/testRFC1738.cc'; then $(CYGPATH_W) 'tests/testRFC1738.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1738.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testRFC1738.Tpo $(DEPDIR)/testRFC1738.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testRFC1738.cc' object='testRFC1738.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1738.obj `if test -f 'tests/testRFC1738.cc'; then $(CYGPATH_W) 'tests/testRFC1738.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1738.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testRFC1738.obj `if test -f 'tests/testRFC1738.cc'; then $(CYGPATH_W) 'tests/testRFC1738.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testRFC1738.cc'; fi` testMain.o: tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f 'tests/testMain.cc' || echo '$(srcdir)/'`tests/testMain.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f 'tests/testMain.cc' || echo '$(srcdir)/'`tests/testMain.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f 'tests/testMain.cc' || echo '$(srcdir)/'`tests/testMain.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f 'tests/testMain.cc' || echo '$(srcdir)/'`tests/testMain.cc testMain.obj: tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f 'tests/testMain.cc'; then $(CYGPATH_W) 'tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testMain.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f 'tests/testMain.cc'; then $(CYGPATH_W) 'tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testMain.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f 'tests/testMain.cc'; then $(CYGPATH_W) 'tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testMain.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f 'tests/testMain.cc'; then $(CYGPATH_W) 'tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testMain.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -700,22 +1021,25 @@ -rm -rf tests/.libs tests/_libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -730,57 +1054,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -796,12 +1075,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -813,15 +1087,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -830,101 +1100,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +tests/testAll.log: tests/testAll$(EXEEXT) + @p='tests/testAll$(EXEEXT)'; \ + b='tests/testAll'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -958,13 +1321,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -1000,6 +1360,9 @@ installcheck: installcheck-recursive mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1083,24 +1446,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/malloc_trace.cc squid-3.4.4.1/lib/malloc_trace.cc --- squid-3.4.4/lib/malloc_trace.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/lib/malloc_trace.cc 2014-04-23 05:50:18.000000000 -0700 @@ -87,30 +87,11 @@ #endif -#if XMALLOC_TRACE -char *xmalloc_file = ""; -int xmalloc_line = 0; -char *xmalloc_func = ""; -static int xmalloc_count = 0; -int xmalloc_trace = 0; /* Enable with -m option */ -size_t xmalloc_total = 0; -#undef xmalloc -#undef xfree -#undef xrealloc -#undef xcalloc -#undef xstrdup -#endif - #if XMALLOC_DEBUG #define DBG_ARRY_SZ (1<<11) #define DBG_ARRY_BKTS (1<<8) static void *(*malloc_ptrs)[DBG_ARRY_SZ]; static int malloc_size[DBG_ARRY_BKTS][DBG_ARRY_SZ]; -#if XMALLOC_TRACE -static char *malloc_file[DBG_ARRY_BKTS][DBG_ARRY_SZ]; -static short malloc_line[DBG_ARRY_BKTS][DBG_ARRY_SZ]; -static int malloc_count[DBG_ARRY_BKTS][DBG_ARRY_SZ]; -#endif static int dbg_initd = 0; #define DBG_HASH_BUCKET(ptr) (((((int)ptr)>>4)+(((int)ptr)>>12)+(((int)ptr)>>20))&0xFF) @@ -126,13 +107,6 @@ for (I = 0; I < DBG_ARRY_SZ; ++I) { malloc_ptrs[B][I] = NULL; malloc_size[B][I] = 0; -#if XMALLOC_TRACE - - malloc_file[B][I] = NULL; - malloc_line[B][I] = 0; - malloc_count[B][I] = 0; -#endif - } } @@ -150,19 +124,7 @@ continue; malloc_ptrs[B][I] = NULL; - malloc_size[B][I] = 0; - -#if XMALLOC_TRACE - - malloc_file[B][I] = NULL; - - malloc_line[B][I] = 0; - - malloc_count[B][I] = 0; - -#endif - break; } @@ -209,19 +171,7 @@ continue; malloc_ptrs[B][I] = p; - malloc_size[B][I] = (int) sz; - -#if XMALLOC_TRACE - - malloc_file[B][I] = xmalloc_file; - - malloc_line[B][I] = xmalloc_line; - - malloc_count[B][I] = xmalloc_count; - -#endif - break; } @@ -235,189 +185,3 @@ #endif -#if XMALLOC_TRACE && !HAVE_MALLOCBLKSIZE -size_t -xmallocblksize(void *p) -{ - int B, I; - B = DBG_HASH_BUCKET(p); - - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] == p) - return malloc_size[B][I]; - } - - return 0; -} - -#endif - -#ifdef XMALLOC_TRACE -static char * -malloc_file_name(void *p) -{ - int B, I; - B = DBG_HASH_BUCKET(p); - - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] == p) - return malloc_file[B][I]; - } - - return 0; -} - -int -malloc_line_number(void *p) -{ - int B, I; - B = DBG_HASH_BUCKET(p); - - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] == p) - return malloc_line[B][I]; - } - - return 0; -} - -int -malloc_number(void *p) -{ - int B, I; - B = DBG_HASH_BUCKET(p); - - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] == p) - return malloc_count[B][I]; - } - - return 0; -} - -static void -xmalloc_show_trace(void *p, int sign) -{ - int statMemoryAccounted(); - static size_t last_total = 0, last_accounted = 0, last_mallinfo = 0; - size_t accounted = statMemoryAccounted(); - size_t mi = 0; - size_t sz; -#if HAVE_MALLINFO - - struct mallinfo mp = mallinfo(); - mi = mp.uordblks + mp.usmblks + mp.hblkhd; -#endif - - sz = xmallocblksize(p) * sign; - xmalloc_total += sz; - xmalloc_count += sign > 0; - - if (xmalloc_trace) { - fprintf(stderr, "%c%8p size=%5d/%d acc=%5d/%d mallinfo=%5d/%d %s:%d %s", - sign > 0 ? '+' : '-', p, - (int) xmalloc_total - last_total, (int) xmalloc_total, - (int) accounted - last_accounted, (int) accounted, - (int) mi - last_mallinfo, (int) mi, - xmalloc_file, xmalloc_line, xmalloc_func); - - if (sign < 0) - fprintf(stderr, " (%d %s:%d)\n", malloc_number(p), malloc_file_name(p), malloc_line_number(p)); - else - fprintf(stderr, " %d\n", xmalloc_count); - } - - last_total = xmalloc_total; - last_accounted = accounted; - last_mallinfo = mi; -} - -short malloc_refs[DBG_ARRY_BKTS][DBG_ARRY_SZ]; -#define XMALLOC_LEAK_ALIGN (4) -static void -xmalloc_scan_region(void *start, int size, int depth) -{ - int B, I; - char *ptr = start; - char *end = ptr + size - XMALLOC_LEAK_ALIGN; - static int sum = 0; - - while (ptr <= end) { - void *p = *(void **) ptr; - - if (p && p != start) { - B = DBG_HASH_BUCKET(p); - - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] == p) { - if (!malloc_refs[B][I]++) { - /* A new reference */ - fprintf(stderr, "%*s%p %s:%d size %d allocation %d\n", - depth, "", - malloc_ptrs[B][I], malloc_file[B][I], - malloc_line[B][I], malloc_size[B][I], - malloc_count[B][I]); - sum += malloc_size[B][I]; - xmalloc_scan_region(malloc_ptrs[B][I], malloc_size[B][I], depth + 1); - - if (depth == 0) { - if (sum != malloc_size[B][I]) - fprintf(stderr, "=== %d bytes\n", sum); - - sum = 0; - } - -#if XMALLOC_SHOW_ALL_REFERENCES - - } else { - /* We have already scanned this pointer... */ - fprintf(stderr, "%*s%p %s:%d size %d allocation %d ... (%d)\n", - depth * 2, "", - malloc_ptrs[B][I], malloc_file[B][I], - malloc_line[B][I], malloc_size[B][I], - malloc_count[B][I], malloc_refs[B][I]); -#endif - - } - } - } - } - - ptr += XMALLOC_LEAK_ALIGN; - } -} - -void -xmalloc_find_leaks(void) -{ - int B, I; - int leak_sum = 0; - - extern void _etext; - fprintf(stderr, "----- Memory map ----\n"); - xmalloc_scan_region(&_etext, (void *) sbrk(0) - (void *) &_etext, 0); - - for (B = 0; B < DBG_ARRY_BKTS; ++B) { - for (I = 0; I < DBG_ARRY_SZ; ++I) { - if (malloc_ptrs[B][I] && malloc_refs[B][I] == 0) { - /* Found a leak... */ - fprintf(stderr, "Leak found: %p", malloc_ptrs[B][I]); - fprintf(stderr, " %s", malloc_file[B][I]); - fprintf(stderr, ":%d", malloc_line[B][I]); - fprintf(stderr, " size %d", malloc_size[B][I]); - fprintf(stderr, " allocation %d\n", malloc_count[B][I]); - leak_sum += malloc_size[B][I]; - } - } - } - - if (leak_sum) { - fprintf(stderr, "Total leaked memory: %d\n", leak_sum); - } else { - fprintf(stderr, "No memory leaks detected\n"); - } - - fprintf(stderr, "----------------------\n"); -} - -#endif /* XMALLOC_TRACE */ diff -u -r -N squid-3.4.4/lib/md5.c squid-3.4.4.1/lib/md5.c --- squid-3.4.4/lib/md5.c 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/lib/md5.c 2014-04-23 05:50:18.000000000 -0700 @@ -32,6 +32,8 @@ #include "squid.h" #include "md5.h" +#if !HAVE_NETTLE_MD5_H + #if HAVE_STRING_H #include /* for memcpy() */ #endif @@ -252,3 +254,4 @@ } #endif /* !ASM_MD5 */ +#endif /* HAVE_ETTLE_MD5_H */ diff -u -r -N squid-3.4.4/lib/ntlmauth/Makefile.in squid-3.4.4.1/lib/ntlmauth/Makefile.in --- squid-3.4.4/lib/ntlmauth/Makefile.in 2014-03-09 01:41:49.000000000 -0800 +++ squid-3.4.4.1/lib/ntlmauth/Makefile.in 2014-04-23 05:51:18.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/ntlmauth @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,39 +152,298 @@ libntlmauth_la_LIBADD = am_libntlmauth_la_OBJECTS = ntlmauth.lo libntlmauth_la_OBJECTS = $(am_libntlmauth_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libntlmauth_la_SOURCES) DIST_SOURCES = $(libntlmauth_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +482,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +500,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +538,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +603,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -369,7 +679,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,6 +701,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -403,14 +714,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libntlmauth.la: $(libntlmauth_la_OBJECTS) $(libntlmauth_la_DEPENDENCIES) - $(CXXLINK) $(libntlmauth_la_OBJECTS) $(libntlmauth_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libntlmauth.la: $(libntlmauth_la_OBJECTS) $(libntlmauth_la_DEPENDENCIES) $(EXTRA_libntlmauth_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libntlmauth_la_OBJECTS) $(libntlmauth_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -430,25 +744,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlmauth.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -456,26 +770,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -487,15 +790,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -504,101 +803,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -646,11 +1031,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -735,19 +1128,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/profiler/Makefile.in squid-3.4.4.1/lib/profiler/Makefile.in --- squid-3.4.4/lib/profiler/Makefile.in 2014-03-09 01:41:49.000000000 -0800 +++ squid-3.4.4.1/lib/profiler/Makefile.in 2014-04-23 05:51:19.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/profiler @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -109,40 +155,299 @@ am__objects_1 = Profiler.lo @ENABLE_XPROF_STATS_TRUE@am_libprofiler_la_OBJECTS = $(am__objects_1) libprofiler_la_OBJECTS = $(am_libprofiler_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = @ENABLE_XPROF_STATS_TRUE@am_libprofiler_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libprofiler_la_SOURCES) DIST_SOURCES = $(am__libprofiler_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -181,6 +486,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -198,6 +504,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -235,11 +542,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -298,6 +607,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -375,7 +685,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,6 +707,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -409,14 +720,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libprofiler.la: $(libprofiler_la_OBJECTS) $(libprofiler_la_DEPENDENCIES) - $(CXXLINK) $(am_libprofiler_la_rpath) $(libprofiler_la_OBJECTS) $(libprofiler_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libprofiler.la: $(libprofiler_la_OBJECTS) $(libprofiler_la_DEPENDENCIES) $(EXTRA_libprofiler_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libprofiler_la_rpath) $(libprofiler_la_OBJECTS) $(libprofiler_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -436,25 +750,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Profiler.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -462,26 +776,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -493,15 +796,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -510,101 +809,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -652,11 +1037,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -741,19 +1134,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/rfcnb/Makefile.in squid-3.4.4.1/lib/rfcnb/Makefile.in --- squid-3.4.4/lib/rfcnb/Makefile.in 2014-03-09 01:41:50.000000000 -0800 +++ squid-3.4.4.1/lib/rfcnb/Makefile.in 2014-04-23 05:51:19.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,30 +152,278 @@ librfcnb_la_LIBADD = am_librfcnb_la_OBJECTS = rfcnb-io.lo rfcnb-util.lo session.lo librfcnb_la_OBJECTS = $(am_librfcnb_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(librfcnb_la_SOURCES) DIST_SOURCES = $(librfcnb_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -169,6 +462,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -186,6 +480,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -223,11 +518,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -286,6 +583,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -369,7 +667,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -391,6 +689,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -403,14 +702,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -librfcnb.la: $(librfcnb_la_OBJECTS) $(librfcnb_la_DEPENDENCIES) - $(LINK) $(librfcnb_la_OBJECTS) $(librfcnb_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +librfcnb.la: $(librfcnb_la_OBJECTS) $(librfcnb_la_DEPENDENCIES) $(EXTRA_librfcnb_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(librfcnb_la_OBJECTS) $(librfcnb_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -432,25 +734,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -458,26 +760,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -489,15 +780,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -506,101 +793,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -648,11 +1014,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -737,19 +1111,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/lib/smblib/Makefile.in squid-3.4.4.1/lib/smblib/Makefile.in --- squid-3.4.4/lib/smblib/Makefile.in 2014-03-09 01:41:50.000000000 -0800 +++ squid-3.4.4.1/lib/smblib/Makefile.in 2014-04-23 05:51:20.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -108,30 +153,278 @@ am_libsmblib_la_OBJECTS = md4.lo smblib.lo smblib-util.lo \ smbencrypt.lo smbdes.lo libsmblib_la_OBJECTS = $(am_libsmblib_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsmblib_la_SOURCES) DIST_SOURCES = $(libsmblib_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -170,6 +463,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -187,6 +481,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -224,11 +519,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -287,6 +584,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -370,7 +668,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -392,6 +690,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -404,14 +703,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsmblib.la: $(libsmblib_la_OBJECTS) $(libsmblib_la_DEPENDENCIES) - $(LINK) $(libsmblib_la_OBJECTS) $(libsmblib_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsmblib.la: $(libsmblib_la_OBJECTS) $(libsmblib_la_DEPENDENCIES) $(EXTRA_libsmblib_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libsmblib_la_OBJECTS) $(libsmblib_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -435,25 +737,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smblib.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -461,26 +763,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -492,15 +783,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -509,101 +796,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -651,11 +1017,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -740,19 +1114,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/libltdl/aclocal.m4 squid-3.4.4.1/libltdl/aclocal.m4 --- squid-3.4.4/libltdl/aclocal.m4 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/aclocal.m4 2014-04-23 05:50:46.000000000 -0700 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +142,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +159,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +172,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +186,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +245,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +302,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +312,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +357,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +369,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +399,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,18 +409,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -432,7 +436,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -461,31 +465,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,34 +509,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -545,7 +602,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +621,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -589,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -614,7 +667,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -641,15 +694,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -657,11 +707,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -674,63 +723,35 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -741,24 +762,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -769,32 +848,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -804,9 +891,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -814,34 +977,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -849,24 +1010,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -876,75 +1035,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -u -r -N squid-3.4.4/libltdl/config/compile squid-3.4.4.1/libltdl/config/compile --- squid-3.4.4/libltdl/config/compile 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/compile 2014-04-23 05:50:41.000000000 -0700 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -u -r -N squid-3.4.4/libltdl/config/config.guess squid-3.4.4.1/libltdl/config/config.guess --- squid-3.4.4/libltdl/config/config.guess 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/config.guess 2014-04-23 05:50:41.000000000 -0700 @@ -1,13 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2003-07-02' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,24 +15,22 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# along with this program; if not, see . # # 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. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +62,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +100,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +119,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -136,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -158,6 +175,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -166,7 +184,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -176,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -196,50 +214,36 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,42 +281,52 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -320,32 +334,51 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +387,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +402,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -382,38 +415,41 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,35 +473,36 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -478,29 +515,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -508,7 +545,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -523,15 +560,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -544,28 +585,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -574,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -627,9 +668,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -637,11 +688,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -669,321 +720,345 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/FreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -991,15 +1066,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1091,68 +1180,99 @@ else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; - esac + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1160,22 +1280,28 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1186,33 +1312,55 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1328,11 +1476,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1341,22 +1490,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1367,7 +1516,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -u -r -N squid-3.4.4/libltdl/config/config.sub squid-3.4.4.1/libltdl/config/config.sub --- squid-3.4.4/libltdl/config/config.sub 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/config.sub 2014-04-23 05:50:41.000000000 -0700 @@ -1,42 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2003-07-04' +timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 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. +# 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# along with this program; if not, see . +# # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +80,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +96,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,10 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -144,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -162,13 +170,17 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -202,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -226,55 +248,106 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -290,58 +363,82 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -359,6 +456,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -376,6 +476,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -399,6 +502,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -407,10 +514,35 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -435,12 +567,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -463,6 +610,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -574,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -613,6 +767,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -624,10 +786,21 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -641,10 +814,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -657,10 +826,21 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -725,9 +905,11 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem @@ -736,9 +918,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -756,6 +941,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -765,6 +958,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -794,9 +993,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -821,6 +1021,14 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -847,6 +1055,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -858,6 +1070,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -879,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -935,17 +1153,9 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -960,6 +1170,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1003,9 +1217,16 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1014,6 +1235,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1033,6 +1258,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1049,13 +1277,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1099,9 +1324,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1122,25 +1350,31 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1158,12 +1392,15 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1176,6 +1413,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1197,6 +1437,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1219,6 +1462,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1252,8 +1498,13 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) ;; -none) ;; @@ -1277,6 +1528,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1286,9 +1543,24 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1307,19 +1579,22 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1332,9 +1607,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1437,7 +1718,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1467,9 +1748,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1494,7 +1781,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -u -r -N squid-3.4.4/libltdl/config/depcomp squid-3.4.4.1/libltdl/config/depcomp --- squid-3.4.4/libltdl/config/depcomp 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/depcomp 2014-04-23 05:50:41.000000000 -0700 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -u -r -N squid-3.4.4/libltdl/config/install-sh squid-3.4.4.1/libltdl/config/install-sh --- squid-3.4.4/libltdl/config/install-sh 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/install-sh 2014-04-23 05:50:41.000000000 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2010-02-06.18; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -232,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -256,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -351,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -389,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -407,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -u -r -N squid-3.4.4/libltdl/config/ltmain.sh squid-3.4.4.1/libltdl/config/ltmain.sh --- squid-3.4.4/libltdl/config/ltmain.sh 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/ltmain.sh 2014-04-23 05:50:42.000000000 -0700 @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.2.10 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -42,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -70,17 +70,19 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.10 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 # automake: $automake_version # autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.10 +VERSION="2.4.2 Debian-2.4.2-1.7" TIMESTAMP="" -package_revision=1.3175 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -135,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -163,6 +160,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -177,17 +195,31 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation -# Generated shell functions inserted here. # These SED scripts presuppose an absolute path with a trailing slash. pathcar='s,^/\([^/]*\).*$,\1,' @@ -351,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -370,6 +402,15 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -398,7 +439,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -424,14 +465,14 @@ # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -650,11 +691,30 @@ fi } +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + # func_version # Echo version message to standard output and exit. func_version () { + $opt_debug + $SED -n '/(C)/!b go :more /\./!{ @@ -676,6 +736,8 @@ # Echo short help message to standard output and exit. func_usage () { + $opt_debug + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// @@ -692,7 +754,10 @@ # unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -702,10 +767,14 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" ret=$? if test -z "$1"; then exit $ret @@ -717,12 +786,39 @@ # exit_cmd. func_missing_arg () { + $opt_debug + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: @@ -732,25 +828,64 @@ magic_exe="%%%MAGIC EXE variable%%%" # Global variables. -# $mode is unset nonopt= -execute_dlfiles= preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. exec_cmd= +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -840,129 +975,209 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - opt_verbose=false + opt_preserve_dup_deps=: ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false + --features) + opt_features=: +func_features ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false - opt_verbose=: +func_append preserve_args " $opt" ;; - - --no-verbose) preserve_args="$preserve_args $opt" + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) opt_verbose=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --help-all) opt_help=': help-all' ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -970,82 +1185,44 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1110,12 +1287,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1161,6 +1335,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1170,26 +1375,10 @@ func_infer_tag () { $opt_debug - - # FreeBSD-specific: where we install compilers with non-standard names - tag_compilers_CC="*cc cc* *gcc gcc* clang" - tag_compilers_CXX="*c++ c++* *g++ g++* clang++" - base_compiler=`set -- "$@"; echo $1` - - # If $tagname isn't set, then try to infer if the default "CC" tag applies - if test -z "$tagname"; then - for zp in $tag_compilers_CC; do - case $base_compiler in - $zp) tagname="CC"; break;; - esac - done - fi - if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1208,8 +1397,7 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1223,22 +1411,7 @@ break ;; esac - - # FreeBSD-specific: try compilers based on inferred tag - if test -z "$tagname"; then - eval "tag_compilers=\$tag_compilers_${z}" - if test -n "$tag_compilers"; then - for zp in $tag_compilers; do - case $base_compiler in - $zp) tagname=$z; break;; - esac - done - if test -n "$tagname"; then - break - fi - fi - fi - fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -1288,10 +1461,490 @@ # Name of the non-PIC object non_pic_object=$write_oldobj -EOF - $MV "${write_libobj}T" "${write_libobj}" - } +EOF + $MV "${write_libobj}T" "${write_libobj}" + } +} + + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi } +# end func_convert_path_nix_to_cygwin + # func_mode_compile arg... func_mode_compile () @@ -1333,12 +1986,12 @@ ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1359,15 +2012,14 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1383,8 +2035,7 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1409,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1515,17 +2166,16 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1545,7 +2195,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1592,11 +2242,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1641,13 +2291,13 @@ } $opt_help || { - test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1823,7 +2473,7 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac @@ -1838,13 +2488,13 @@ else { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done } | sed -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do echo func_mode_help done @@ -1873,13 +2523,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1901,7 +2554,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1958,8 +2611,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1991,22 +2643,59 @@ fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2016,7 +2705,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -2025,53 +2714,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2096,7 +2787,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -2116,7 +2807,7 @@ do arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -2154,11 +2845,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then func_quote_for_eval "$arg2" fi - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2170,7 +2861,7 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -2228,10 +2919,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2245,19 +2939,19 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. @@ -2334,7 +3028,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2508,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2531,7 +3227,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2578,6 +3274,18 @@ #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2589,8 +3297,9 @@ # Add our own program objects to the symbol list. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2639,10 +3348,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2680,26 +3431,9 @@ const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - echo >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - echo >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2739,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2755,7 +3489,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2783,9 +3517,6 @@ ;; esac ;; - *-*-freebsd*) - # FreeBSD doesn't need this... - ;; *) func_fatal_error "unknown suffix for \`$my_dlsyms'" ;; @@ -2821,7 +3552,8 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - win32_nmres=`eval $NM -f posix -A $1 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2850,6 +3582,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -3128,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -3228,6 +4088,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -3242,14 +4114,6 @@ " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. @@ -3267,166 +4131,6 @@ } -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist - # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout # Must ONLY be called from within func_mode_link because @@ -3596,14 +4300,14 @@ EOF cat </dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7050,7 +7833,7 @@ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7075,7 +7858,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7091,7 +7874,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -7104,7 +7887,7 @@ potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7129,7 +7912,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7233,7 +8016,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7243,10 +8026,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -7258,15 +8041,22 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -7275,18 +8065,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -7294,17 +8084,13 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -7312,7 +8098,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -7338,7 +8124,7 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -7349,7 +8135,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7380,13 +8166,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7420,7 +8238,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7430,7 +8248,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7450,21 +8268,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7526,10 +8344,13 @@ echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done echo ')' >> $output - delfiles="$delfiles $output" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7543,10 +8364,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7597,7 +8420,7 @@ if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7631,7 +8454,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7664,7 +8487,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7705,10 +8528,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7724,7 +8547,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7736,7 +8559,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7820,13 +8643,16 @@ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test @@ -7900,8 +8726,8 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -7921,7 +8747,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7931,17 +8757,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7949,7 +8775,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7968,18 +8794,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7988,12 +8814,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -8019,18 +8845,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -8081,6 +8907,12 @@ exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8103,7 +8935,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8111,7 +8943,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8126,6 +8958,13 @@ $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -8159,6 +8998,12 @@ func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -8256,7 +9101,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -8264,10 +9109,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -8278,10 +9123,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -8299,7 +9144,7 @@ else echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -8323,18 +9168,30 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8428,12 +9285,23 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8447,9 +9315,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8466,7 +9334,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8478,7 +9346,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8487,7 +9355,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -8572,7 +9440,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8592,9 +9460,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8603,24 +9471,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8646,18 +9513,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8685,19 +9551,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8707,7 +9573,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8716,7 +9582,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8724,12 +9590,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8737,7 +9603,6 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8749,16 +9614,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -u -r -N squid-3.4.4/libltdl/config/missing squid-3.4.4.1/libltdl/config/missing --- squid-3.4.4/libltdl/config/missing 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/config/missing 2014-04-23 05:50:42.000000000 -0700 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 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 @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -u -r -N squid-3.4.4/libltdl/config-h.in squid-3.4.4.1/libltdl/config-h.in --- squid-3.4.4/libltdl/config-h.in 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/config-h.in 2014-04-23 05:50:46.000000000 -0700 @@ -124,6 +124,9 @@ /* The archive extension */ #undef LT_LIBEXT +/* The archive prefix */ +#undef LT_LIBPREFIX + /* Define to the extension used for runtime loadable modules, say, ".so". */ #undef LT_MODULE_EXT @@ -135,6 +138,9 @@ */ #undef LT_OBJDIR +/* Define to the shared library suffix, say, ".dylib". */ +#undef LT_SHARED_EXT + /* Define if dlsym() requires a leading underscore in symbol names. */ #undef NEED_USCORE diff -u -r -N squid-3.4.4/libltdl/configure squid-3.4.4.1/libltdl/configure --- squid-3.4.4/libltdl/configure 2014-03-09 01:41:34.000000000 -0800 +++ squid-3.4.4.1/libltdl/configure 2014-04-23 05:50:46.000000000 -0700 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libltdl 2.2.10. +# Generated by GNU Autoconf 2.69 for libltdl 2.4.2. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -221,14 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -327,10 +363,18 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -367,19 +411,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -452,6 +496,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +534,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +555,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -543,7 +571,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -562,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libltdl' PACKAGE_TARNAME='libltdl' -PACKAGE_VERSION='2.2.10' -PACKAGE_STRING='libltdl 2.2.10' +PACKAGE_VERSION='2.4.2' +PACKAGE_STRING='libltdl 2.4.2' PACKAGE_BUGREPORT='bug-libtool@gnu.org' PACKAGE_URL='' @@ -628,7 +656,9 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR LN_S NM @@ -642,6 +672,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -667,6 +698,10 @@ OBJDUMP DLLTOOL AS +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -731,12 +766,14 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_shared enable_static with_pic enable_fast_install enable_dependency_tracking with_gnu_ld +with_sysroot enable_libtool_lock enable_ltdl_install ' @@ -811,8 +848,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -857,7 +895,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -883,7 +921,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1087,7 +1125,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1103,7 +1141,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1133,8 +1171,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1142,7 +1180,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1152,7 +1190,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1160,13 +1198,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1189,7 +1227,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1203,8 +1241,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1219,9 +1255,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1260,11 +1296,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1290,7 +1326,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 libltdl 2.2.10 to adapt to many kinds of systems. +\`configure' configures libltdl 2.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1340,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1360,7 +1396,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libltdl 2.2.10:";; + short | recursive ) echo "Configuration of libltdl 2.4.2:";; esac cat <<\_ACEOF @@ -1368,21 +1404,27 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) --enable-ltdl-install install libltdl Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). Some influential environment variables: CC C compiler command @@ -1460,10 +1502,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libltdl configure 2.2.10 -generated by GNU Autoconf 2.65 +libltdl configure 2.4.2 +generated by GNU Autoconf 2.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1507,7 +1549,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1539,7 +1581,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1553,7 +1595,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1567,7 +1609,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1585,7 +1627,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1610,7 +1652,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1621,7 +1663,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1663,7 +1705,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1676,7 +1718,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1731,19 +1773,22 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1752,8 +1797,12 @@ int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -1770,7 +1819,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_decl @@ -1783,7 +1832,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1824,15 +1873,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libltdl $as_me 2.2.10, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by libltdl $as_me 2.4.2, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1942,11 +1991,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1980,11 +2027,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1997,11 +2042,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2015,11 +2058,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2074,7 +2115,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2089,7 +2135,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2165,7 +2215,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2183,16 +2233,22 @@ ac_aux_dir= for ac_dir in config "$srcdir"/config; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2217,7 +2273,7 @@ ## Automake Initialisation. ## ## ------------------------ ## -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2236,7 +2292,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2256,7 +2312,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2314,56 +2370,71 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2386,12 +2457,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2403,17 +2474,17 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2425,7 +2496,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2453,7 +2524,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2465,7 +2536,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2506,7 +2577,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2516,7 +2587,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2545,19 +2616,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2569,7 +2634,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2597,7 +2662,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2605,7 +2670,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2633,13 +2698,52 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2655,7 +2759,7 @@ # Define the identity of the package. PACKAGE='libltdl' - VERSION='2.2.10' + VERSION='2.4.2' cat >>confdefs.h <<_ACEOF @@ -2683,19 +2787,71 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + -AMTAR=${AMTAR-"${am_missing_run}tar"} +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ## ------------------------------- ## ## Libtool specific configuration. ## @@ -2714,8 +2870,8 @@ -macro_version='2.2.10' -macro_revision='1.3175' +macro_version='2.4.2' +macro_revision='1.3337' @@ -2733,27 +2889,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2771,14 +2927,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2786,7 +2942,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2826,7 +2982,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -2890,7 +3046,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -2923,6 +3079,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -2943,7 +3100,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2955,7 +3112,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2983,7 +3140,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2995,7 +3152,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3036,7 +3193,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3048,7 +3205,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3076,7 +3233,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3089,7 +3246,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3135,7 +3292,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3147,7 +3304,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3179,7 +3336,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3191,7 +3348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3233,8 +3390,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3348,9 +3505,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3392,8 +3548,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3450,9 +3606,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3463,7 +3619,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3503,8 +3659,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3514,7 +3670,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3551,7 +3707,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3629,7 +3785,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3638,8 +3794,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3724,19 +3879,79 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3770,16 +3985,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3788,16 +4003,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3853,7 +4068,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -3870,10 +4085,10 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -3908,7 +4123,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -3935,7 +4150,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3949,7 +4164,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3984,7 +4199,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -3998,7 +4213,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4015,7 +4230,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4050,7 +4265,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4065,7 +4280,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4082,7 +4297,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4117,7 +4332,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4196,7 +4411,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4233,10 +4448,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4263,7 +4478,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4326,7 +4541,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4338,7 +4553,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4370,7 +4585,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4382,7 +4597,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4442,7 +4657,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then : +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -4477,7 +4692,7 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -4540,6 +4755,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -4566,7 +4786,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$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 @@ -4579,7 +4800,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -4622,8 +4843,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -4672,9 +4893,83 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -4688,6 +4983,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -4710,7 +5010,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4722,7 +5022,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4750,7 +5050,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4762,7 +5062,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4806,7 +5106,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -4885,10 +5185,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -4926,12 +5222,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -5008,6 +5304,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -5023,12 +5334,163 @@ + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5040,8 +5502,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5061,14 +5523,18 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5080,8 +5546,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5100,6 +5566,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -5111,12 +5581,13 @@ esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + @@ -5125,6 +5596,61 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + @@ -5133,7 +5659,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5145,7 +5671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5173,7 +5699,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5185,7 +5711,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5232,7 +5758,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5244,7 +5770,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5272,7 +5798,7 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5284,7 +5810,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5334,13 +5860,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -5401,7 +5927,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5462,8 +5988,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -5487,6 +6013,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -5499,6 +6026,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5540,6 +6068,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -5551,7 +6091,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -5577,8 +6117,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -5588,8 +6128,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -5626,6 +6166,12 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi @@ -5648,6 +6194,48 @@ + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; @@ -5714,7 +6302,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5730,9 +6318,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -5751,7 +6349,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -5773,7 +6374,7 @@ CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -5814,7 +6415,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -5825,7 +6426,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -5841,6 +6455,123 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) @@ -5849,7 +6580,7 @@ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -5861,7 +6592,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5889,7 +6620,7 @@ set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -5901,7 +6632,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5941,7 +6672,7 @@ set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -5953,7 +6684,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5981,7 +6712,7 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -5993,7 +6724,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6033,7 +6764,7 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6045,7 +6776,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6073,7 +6804,7 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6085,7 +6816,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6125,7 +6856,7 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6137,7 +6868,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6165,7 +6896,7 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6177,7 +6908,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6217,7 +6948,7 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6229,7 +6960,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6257,7 +6988,7 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6269,7 +7000,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6332,7 +7063,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6348,7 +7079,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -6359,9 +7096,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -6391,9 +7129,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } -if test "${lt_cv_ld_force_load+set}" = set; then : +if ${lt_cv_ld_force_load+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -6412,7 +7151,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -6470,7 +7211,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6500,7 +7241,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6516,11 +7257,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -6559,7 +7300,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6575,18 +7316,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6598,7 +7339,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6715,8 +7456,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6730,7 +7470,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -6754,7 +7494,7 @@ set dummy ${ac_tool_prefix}as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AS+set}" = set; then : +if ${ac_cv_prog_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AS"; then @@ -6766,7 +7506,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6794,7 +7534,7 @@ set dummy as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : +if ${ac_cv_prog_ac_ct_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then @@ -6806,7 +7546,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6846,7 +7586,7 @@ set dummy ${ac_tool_prefix}dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -6858,7 +7598,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6886,7 +7626,7 @@ set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -6898,7 +7638,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6938,7 +7678,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -6950,7 +7690,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6978,7 +7718,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -6990,7 +7730,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7115,7 +7855,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -7193,6 +7948,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -7214,7 +7973,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7292,7 +8051,7 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7358,7 +8117,7 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7500,7 +8259,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7553,8 +8312,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7654,7 +8411,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -7698,7 +8457,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -7719,6 +8478,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -7739,18 +8504,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -7835,16 +8615,20 @@ lt_prog_compiler_pic= ;; *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -7852,7 +8636,7 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -7905,13 +8689,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -7954,7 +8743,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8009,7 +8798,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8103,7 +8892,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -8147,6 +8935,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -8255,7 +9046,8 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -8303,7 +9095,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -8352,8 +9144,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -8368,13 +9159,13 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -8392,8 +9183,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8439,8 +9230,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8545,6 +9336,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -8570,7 +9362,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8583,22 +9381,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -8610,7 +9415,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8623,22 +9434,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -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 + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_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 "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -8683,20 +9501,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=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. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # 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. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=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. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -8708,6 +9570,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -8736,10 +9599,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=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 @@ -8752,7 +9611,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -8761,7 +9620,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -8769,7 +9628,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$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 @@ -8785,13 +9644,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -8809,10 +9667,10 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -8829,7 +9687,7 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if test "${lt_cv_prog_compiler__b+set}" = set; then : +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -8891,23 +9749,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -8919,7 +9790,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -8992,7 +9863,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' @@ -9011,9 +9882,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -9201,7 +10072,7 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -9402,11 +10273,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -9496,7 +10362,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -9505,7 +10371,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -9570,7 +10436,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -9589,8 +10455,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -9623,13 +10490,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -9650,7 +10575,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -9658,10 +10583,6 @@ 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. @@ -9669,7 +10590,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -9687,7 +10608,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -9706,18 +10627,8 @@ 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 - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -9778,7 +10689,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -9794,7 +10705,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -9831,9 +10742,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -9843,7 +10754,7 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -9896,6 +10807,18 @@ 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 @@ -9915,7 +10838,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -9984,7 +10907,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10009,7 +10932,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10033,7 +10956,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10064,7 +10987,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10074,7 +10997,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10263,7 +11186,7 @@ # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10297,7 +11220,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10311,12 +11234,12 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10350,16 +11273,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10393,12 +11316,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10432,12 +11355,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10471,7 +11394,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10512,7 +11435,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10565,10 +11488,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10618,7 +11541,7 @@ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10671,10 +11594,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10856,6 +11779,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -10866,12 +11791,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which extension is used for runtime loadable modules" >&5 $as_echo_n "checking which extension is used for runtime loadable modules... " >&6; } -if test "${libltdl_cv_shlibext+set}" = set; then : +if ${libltdl_cv_shlibext+:} false; then : $as_echo_n "(cached) " >&6 else module=yes eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_shlibext" >&5 @@ -10883,10 +11810,17 @@ _ACEOF fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + +cat >>confdefs.h <<_ACEOF +#define LT_SHARED_EXT "$libltdl_cv_shrext" +_ACEOF + +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variable specifies run-time module search path" >&5 $as_echo_n "checking which variable specifies run-time module search path... " >&6; } -if test "${lt_cv_module_path_var+set}" = set; then : +if ${lt_cv_module_path_var+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_module_path_var="$shlibpath_var" @@ -10903,7 +11837,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the default library search path" >&5 $as_echo_n "checking for the default library search path... " >&6; } -if test "${lt_cv_sys_dlsearch_path+set}" = set; then : +if ${lt_cv_sys_dlsearch_path+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec" @@ -10940,7 +11874,7 @@ LIBADD_DLOPEN= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 $as_echo_n "checking for library containing dlopen... " >&6; } -if test "${ac_cv_search_dlopen+set}" = set; then : +if ${ac_cv_search_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -10974,11 +11908,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_dlopen+set}" = set; then : + if ${ac_cv_search_dlopen+:} false; then : break fi done -if test "${ac_cv_search_dlopen+set}" = set; then : +if ${ac_cv_search_dlopen+:} false; then : else ac_cv_search_dlopen=no @@ -11023,7 +11957,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11057,7 +11991,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : $as_echo "#define HAVE_LIBDL 1" >>confdefs.h @@ -11077,7 +12011,7 @@ for ac_func in dlerror do : ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror" -if test "x$ac_cv_func_dlerror" = x""yes; then : +if test "x$ac_cv_func_dlerror" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLERROR 1 _ACEOF @@ -11091,7 +12025,7 @@ LIBADD_SHL_LOAD= ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h @@ -11099,7 +12033,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11133,7 +12067,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h @@ -11149,7 +12083,7 @@ darwin[1567].*) # We only want this for pre-Mac OS X 10.4. ac_fn_c_check_func "$LINENO" "_dyld_func_lookup" "ac_cv_func__dyld_func_lookup" -if test "x$ac_cv_func__dyld_func_lookup" = x""yes; then : +if test "x$ac_cv_func__dyld_func_lookup" = xyes; then : $as_echo "#define HAVE_DYLD 1" >>confdefs.h @@ -11163,7 +12097,7 @@ cygwin* | mingw* | os2* | pw32*) ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include " -if test "x$ac_cv_have_decl_cygwin_conv_path" = x""yes; then : +if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then : ac_have_decl=1 else ac_have_decl=0 @@ -11179,7 +12113,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11213,7 +12147,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : $as_echo "#define HAVE_DLD 1" >>confdefs.h @@ -11247,7 +12181,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix in compiled symbols" >&5 $as_echo_n "checking for _ prefix in compiled symbols... " >&6; } -if test "${lt_cv_sys_symbol_underscore+set}" = set; then : +if ${lt_cv_sys_symbol_underscore+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_sys_symbol_underscore=no @@ -11297,7 +12231,7 @@ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have to add an underscore for dlsym" >&5 $as_echo_n "checking whether we have to add an underscore for dlsym... " >&6; } -if test "${libltdl_cv_need_uscore+set}" = set; then : +if ${libltdl_cv_need_uscore+:} false; then : $as_echo_n "(cached) " >&6 else libltdl_cv_need_uscore=unknown @@ -11353,10 +12287,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11413,7 +12347,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether deplibs are loaded by dlopen" >&5 $as_echo_n "checking whether deplibs are loaded by dlopen... " >&6; } -if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then : +if ${lt_cv_sys_dlopen_deplibs+:} false; then : $as_echo_n "(cached) " >&6 else # PORTME does your system automatically load deplibs for dlopen? @@ -11465,7 +12399,7 @@ # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@ -11519,7 +12453,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "argz.h" "ac_cv_header_argz_h" "$ac_includes_default " -if test "x$ac_cv_header_argz_h" = x""yes; then : +if test "x$ac_cv_header_argz_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ARGZ_H 1 _ACEOF @@ -11533,7 +12467,7 @@ # include #endif " -if test "x$ac_cv_type_error_t" = x""yes; then : +if test "x$ac_cv_type_error_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ERROR_T 1 @@ -11556,8 +12490,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11576,7 +12509,7 @@ if test -z "$ARGZ_H"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking if argz actually works" >&5 $as_echo_n "checking if argz actually works... " >&6; } -if test "${lt_cv_sys_argz_works+set}" = set; then : +if ${lt_cv_sys_argz_works+:} false; then : $as_echo_n "(cached) " >&6 else case $host_os in #( @@ -11607,7 +12540,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_argz_works" >&5 $as_echo "$lt_cv_sys_argz_works" >&6; } - if test $lt_cv_sys_argz_works = yes; then : + if test "$lt_cv_sys_argz_works" = yes; then : $as_echo "#define HAVE_WORKING_ARGZ 1" >>confdefs.h @@ -11626,7 +12559,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libtool supports -dlopen/-dlpreopen" >&5 $as_echo_n "checking whether libtool supports -dlopen/-dlpreopen... " >&6; } -if test "${libltdl_cv_preloaded_symbols+set}" = set; then : +if ${libltdl_cv_preloaded_symbols+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$lt_cv_sys_global_symbol_pipe"; then @@ -11691,8 +12624,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -11706,8 +12638,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11726,8 +12657,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11749,8 +12679,16 @@ _ACEOF +name= +eval "lt_libprefix=\"$libname_spec\"" + +cat >>confdefs.h <<_ACEOF +#define LT_LIBPREFIX "$lt_libprefix" +_ACEOF + + name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +eval "LTDLOPEN=\"$libname_spec\"" @@ -11824,10 +12762,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -11843,6 +12792,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -11857,6 +12807,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -11866,24 +12824,24 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then - as_fn_error "conditional \"INSTALL_LTDL\" was never defined. + as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then - as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined. + as_fn_error $? "conditional \"CONVENIENCE_LTDL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi LT_CONFIG_H=config.h -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -11984,6 +12942,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12029,19 +12988,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -12179,16 +13138,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -12237,7 +13196,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -12248,28 +13207,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -12290,8 +13237,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libltdl $as_me 2.2.10, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by libltdl $as_me 2.4.2, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12356,11 +13303,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libltdl config.status 2.2.10 -configured by $0, generated by GNU Autoconf 2.65, +libltdl config.status 2.4.2 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12378,11 +13325,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -12404,6 +13356,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -12416,7 +13369,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -12425,7 +13378,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -12445,7 +13398,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -12490,6 +13443,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -12510,12 +13464,18 @@ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -12530,14 +13490,17 @@ lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -12561,7 +13524,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -12570,12 +13532,12 @@ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -12620,6 +13582,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -12632,8 +13595,12 @@ reload_flag \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -12643,12 +13610,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -12662,9 +13631,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -12700,6 +13667,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -12748,7 +13716,7 @@ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -12771,9 +13739,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -12781,12 +13750,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -12803,12 +13773,12 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -12817,18 +13787,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -12836,7 +13806,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -12884,7 +13854,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -12916,21 +13886,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -12942,7 +13920,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -12954,11 +13932,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13043,7 +14021,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -13056,7 +14034,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -13075,7 +14053,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -13084,7 +14062,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -13110,8 +14088,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -13247,23 +14225,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -13272,21 +14251,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -13332,7 +14311,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -13345,7 +14324,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -13379,21 +14358,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -13447,8 +14424,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -13511,6 +14488,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -13560,16 +14540,36 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # 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". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -13599,6 +14599,12 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -13608,6 +14614,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -13722,12 +14731,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -13777,10 +14786,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# 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_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -13814,9 +14819,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# 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=$always_export_symbols @@ -13832,6 +14834,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -13864,210 +14869,169 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -14082,7 +15046,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -14103,7 +15067,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -u -r -N squid-3.4.4/libltdl/configure.ac squid-3.4.4.1/libltdl/configure.ac --- squid-3.4.4/libltdl/configure.ac 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/configure.ac 2014-04-23 05:50:45.000000000 -0700 @@ -40,7 +40,7 @@ ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libltdl], [2.2.10], [bug-libtool@gnu.org]) +AC_INIT([libltdl], [2.4.2], [bug-libtool@gnu.org]) AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([ltdl.c]) AC_CONFIG_AUX_DIR([config]) diff -u -r -N squid-3.4.4/libltdl/libltdl/lt_system.h squid-3.4.4.1/libltdl/libltdl/lt_system.h --- squid-3.4.4/libltdl/libltdl/lt_system.h 2014-03-09 01:41:35.000000000 -0800 +++ squid-3.4.4.1/libltdl/libltdl/lt_system.h 2014-04-23 05:50:49.000000000 -0700 @@ -1,6 +1,6 @@ /* lt_system.h -- system portability abstraction layer - Copyright (C) 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2010 Free Software Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the @@ -76,6 +76,18 @@ # endif #endif +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* Canonicalise Windows and Cygwin recognition macros. To match the values set by recent Cygwin compilers, make sure that if __CYGWIN__ is defined (after canonicalisation), __WINDOWS__ is NOT! */ diff -u -r -N squid-3.4.4/libltdl/ltdl.c squid-3.4.4.1/libltdl/ltdl.c --- squid-3.4.4/libltdl/ltdl.c 2014-03-09 01:41:35.000000000 -0800 +++ squid-3.4.4.1/libltdl/ltdl.c 2014-04-23 05:50:50.000000000 -0700 @@ -1,7 +1,7 @@ /* ltdl.c -- system independent dlopen wrapper Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2011 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -54,6 +54,10 @@ # define LT_LIBEXT "a" #endif +#if !defined(LT_LIBPREFIX) +# define LT_LIBPREFIX "lib" +#endif + /* This is the maximum symbol size that won't require malloc/free */ #undef LT_SYMBOL_LENGTH #define LT_SYMBOL_LENGTH 128 @@ -72,9 +76,15 @@ static const char objdir[] = LT_OBJDIR; static const char archive_ext[] = LT_ARCHIVE_EXT; static const char libext[] = LT_LIBEXT; +static const char libprefix[] = LT_LIBPREFIX; #if defined(LT_MODULE_EXT) static const char shlib_ext[] = LT_MODULE_EXT; #endif +/* If the loadable module suffix is not the same as the linkable + * shared library suffix, this will be defined. */ +#if defined(LT_SHARED_EXT) +static const char shared_ext[] = LT_SHARED_EXT; +#endif #if defined(LT_DLSEARCH_PATH) static const char sys_dlsearch_path[] = LT_DLSEARCH_PATH; #endif @@ -208,7 +218,7 @@ LT_SCOPE const lt_dlvtable * get_vtable (lt_user_data data); LT_END_C_DECLS #ifdef HAVE_LIBDLLOADER -extern lt_dlsymlist preloaded_symbols[]; +extern LT_DLSYM_CONST lt_dlsymlist preloaded_symbols[]; #endif /* Initialize libltdl. */ @@ -1079,14 +1089,17 @@ /* Windows native tools do not understand the POSIX paths we store in libdir. */ -#ifndef __WINDOWS__ #undef STR_LIBDIR #define STR_LIBDIR "libdir=" else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0) { errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]); - } +#ifdef __WINDOWS__ + /* Disallow following unix-style paths on MinGW. */ + if (*libdir && (**libdir == '/' || **libdir == '\\')) + **libdir = '\0'; #endif + } #undef STR_DL_DEPLIBS #define STR_DL_DEPLIBS "dependency_libs=" @@ -1269,8 +1282,8 @@ if (vtable) { - /* name + "." + libext + NULL */ - archive_name = MALLOC (char, LT_STRLEN (name) + strlen (libext) + 2); + /* libprefix + name + "." + libext + NULL */ + archive_name = MALLOC (char, strlen (libprefix) + LT_STRLEN (name) + strlen (libext) + 2); *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle)); if ((*phandle == NULL) || (archive_name == NULL)) @@ -1282,7 +1295,14 @@ /* Preloaded modules are always named according to their old archive name. */ - sprintf (archive_name, "%s.%s", name, libext); + if (strncmp(name, "lib", 3) == 0) + { + sprintf (archive_name, "%s%s.%s", libprefix, name + 3, libext); + } + else + { + sprintf (archive_name, "%s.%s", name, libext); + } if (tryall_dlopen (&newhandle, archive_name, advise, vtable) == 0) { @@ -1522,6 +1542,9 @@ #if defined(LT_MODULE_EXT) || (streq (ext, shlib_ext)) #endif +#if defined(LT_SHARED_EXT) + || (streq (ext, shared_ext)) +#endif )) { return 1; @@ -1664,6 +1687,17 @@ /* As before, if the file was found but loading failed, return now with the current error message. */ + if (handle || ((errors > 0) && !file_not_found ())) + return handle; +#endif + +#if defined(LT_SHARED_EXT) + /* Try appending SHARED_EXT. */ + LT__SETERRORSTR (saved_error); + errors = try_dlopen (&handle, filename, shared_ext, advise); + + /* As before, if the file was found but loading failed, return now + with the current error message. */ if (handle || ((errors > 0) && !file_not_found ())) return handle; #endif diff -u -r -N squid-3.4.4/libltdl/ltdl.h squid-3.4.4.1/libltdl/ltdl.h --- squid-3.4.4/libltdl/ltdl.h 2014-03-09 01:41:35.000000000 -0800 +++ squid-3.4.4.1/libltdl/ltdl.h 2014-04-23 05:50:50.000000000 -0700 @@ -102,10 +102,11 @@ lt_dlpreload_callback_func *func); #define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols -#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \ - extern const lt_dlsymlist lt_preloaded_symbols[]; \ - lt_dlpreload_default(lt_preloaded_symbols); \ - }LT_STMT_END +/* Ensure C linkage. */ +extern LT_DLSYM_CONST lt_dlsymlist lt__PROGRAM__LTX_preloaded_symbols[]; + +#define LTDL_SET_PRELOADED_SYMBOLS() \ + lt_dlpreload_default(lt_preloaded_symbols) diff -u -r -N squid-3.4.4/libltdl/m4/argz.m4 squid-3.4.4.1/libltdl/m4/argz.m4 --- squid-3.4.4/libltdl/m4/argz.m4 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/m4/argz.m4 2014-04-23 05:50:42.000000000 -0700 @@ -66,7 +66,7 @@ ;; #( *) lt_cv_sys_argz_works=yes ;; esac]]) - AS_IF([test $lt_cv_sys_argz_works = yes], + AS_IF([test "$lt_cv_sys_argz_works" = yes], [AC_DEFINE([HAVE_WORKING_ARGZ], 1, [This value is set to 1 to indicate that the system argz facility works])], [ARGZ_H=argz.h diff -u -r -N squid-3.4.4/libltdl/m4/libtool.m4 squid-3.4.4.1/libltdl/m4/libtool.m4 --- squid-3.4.4/libltdl/m4/libtool.m4 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/m4/libtool.m4 2014-04-23 05:50:43.000000000 -0700 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -168,10 +170,13 @@ dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -634,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -748,15 +753,12 @@ # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1073,30 +1117,41 @@ fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # 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. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_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 +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`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 "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX @@ -1121,7 +1176,7 @@ AC_MSG_CHECKING([how to print strings]) # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -1165,6 +1220,39 @@ ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1224,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1236,9 +1324,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1257,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1286,14 +1387,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1311,14 +1425,47 @@ ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1337,13 +1484,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1523,6 +1670,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -1549,7 +1701,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$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 @@ -1562,7 +1715,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -1658,10 +1811,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -2108,7 +2261,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2117,7 +2270,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2182,7 +2335,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -2201,8 +2354,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2235,13 +2389,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + 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 + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # 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' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2262,7 +2474,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2270,10 +2482,6 @@ 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. @@ -2281,7 +2489,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2299,7 +2507,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2318,18 +2526,8 @@ 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 - ;; - haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2390,7 +2588,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2406,7 +2604,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2443,9 +2641,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2489,6 +2687,18 @@ 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 @@ -2508,7 +2718,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2577,7 +2787,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2602,7 +2812,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2626,7 +2836,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2657,7 +2867,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2667,7 +2877,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2945,6 +3155,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3043,10 +3258,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3084,12 +3295,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +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 @@ -3163,6 +3374,21 @@ ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + 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 @@ -3170,7 +3396,11 @@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3273,6 +3503,67 @@ dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + # LT_LIB_M # -------- @@ -3399,8 +3690,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3424,6 +3715,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3436,6 +3728,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3469,6 +3762,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -3480,7 +3785,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -3506,15 +3811,15 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_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" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3547,6 +3852,13 @@ AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3557,6 +3869,8 @@ _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3568,7 +3882,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3673,6 +3986,12 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # 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_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -3729,7 +4048,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3793,7 +4112,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3981,7 +4300,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4026,7 +4347,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4047,6 +4368,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4067,18 +4394,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4166,9 +4508,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4187,6 +4531,8 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4207,6 +4553,7 @@ m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4215,6 +4562,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. @@ -4229,15 +4577,25 @@ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_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' - ;; + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4252,7 +4610,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4297,6 +4654,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4405,7 +4765,8 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4453,7 +4814,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -4502,8 +4863,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -4518,13 +4878,13 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4542,8 +4902,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4589,8 +4949,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4695,6 +5055,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4720,7 +5081,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else @@ -4731,7 +5092,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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. @@ -4775,20 +5136,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_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_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -4801,10 +5206,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_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 @@ -4817,7 +5218,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -4826,7 +5227,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4834,7 +5235,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${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_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 @@ -4850,13 +5251,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -4874,10 +5274,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -4924,16 +5324,31 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -4945,7 +5360,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5018,7 +5433,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' @@ -5037,9 +5452,9 @@ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_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}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5283,9 +5698,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [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]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5311,8 +5723,6 @@ to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5323,6 +5733,8 @@ [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5424,6 +5836,7 @@ m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then @@ -5442,7 +5855,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5485,6 +5897,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5502,6 +5915,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5523,8 +5937,8 @@ # 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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_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_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5665,7 +6079,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -5677,7 +6091,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_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. @@ -5719,29 +6133,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_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_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_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # 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_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_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_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_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -5764,7 +6224,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -5780,9 +6240,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5816,7 +6273,7 @@ ;; *) if test "$GXX" = yes; then - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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_TAGVAR(ld_shlibs, $1)=no @@ -5887,10 +6344,10 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -5931,9 +6388,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5944,7 +6401,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6211,7 +6668,7 @@ _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6298,9 +6755,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_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' + $CC -shared $pic_flag -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 @@ -6429,6 +6886,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6443,6 +6901,29 @@ ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6451,6 +6932,7 @@ # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6500,7 +6982,20 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -6512,7 +7007,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -6521,13 +7016,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -6547,8 +7051,10 @@ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -6584,6 +7090,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -6683,7 +7190,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6733,7 +7239,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6787,6 +7295,7 @@ GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -6813,7 +7322,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6863,7 +7371,9 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -6919,7 +7429,8 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -6956,10 +7467,12 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -6990,10 +7503,82 @@ AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_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_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7025,9 +7610,11 @@ # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7040,7 +7627,8 @@ GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -7060,6 +7648,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7099,6 +7694,15 @@ AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -7192,8 +7796,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7232,206 +7836,162 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -_LT_EOF -esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac ]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff -u -r -N squid-3.4.4/libltdl/m4/ltdl.m4 squid-3.4.4.1/libltdl/m4/ltdl.m4 --- squid-3.4.4/libltdl/m4/ltdl.m4 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/m4/ltdl.m4 2014-04-23 05:50:43.000000000 -0700 @@ -1,6 +1,6 @@ # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- # -# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1999-2006, 2007, 2008, 2011 Free Software Foundation, Inc. # Written by Thomas Tanner, 1999 # # This file is free software; the Free Software Foundation gives @@ -410,8 +410,13 @@ m4_pattern_allow([LT_LIBEXT])dnl AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) +name= +eval "lt_libprefix=\"$libname_spec\"" +m4_pattern_allow([LT_LIBPREFIX])dnl +AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix]) + name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +eval "LTDLOPEN=\"$libname_spec\"" AC_SUBST([LTDLOPEN]) ])# _LTDL_SETUP @@ -488,7 +493,7 @@ # at 6.2 and later dlopen does load deplibs. lt_cv_sys_dlopen_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) lt_cv_sys_dlopen_deplibs=yes ;; openbsd*) @@ -548,12 +553,19 @@ [ module=yes eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds ]) if test -n "$libltdl_cv_shlibext"; then m4_pattern_allow([LT_MODULE_EXT])dnl AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], [Define to the extension used for runtime loadable modules, say, ".so".]) fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + m4_pattern_allow([LT_SHARED_EXT])dnl + AC_DEFINE_UNQUOTED([LT_SHARED_EXT], ["$libltdl_cv_shrext"], + [Define to the shared library suffix, say, ".dylib".]) +fi ])# LT_SYS_MODULE_EXT # Old name: diff -u -r -N squid-3.4.4/libltdl/m4/ltoptions.m4 squid-3.4.4.1/libltdl/m4/ltoptions.m4 --- squid-3.4.4/libltdl/m4/ltoptions.m4 2014-03-09 01:41:32.000000000 -0800 +++ squid-3.4.4.1/libltdl/m4/ltoptions.m4 2014-04-23 05:50:43.000000000 -0700 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -u -r -N squid-3.4.4/libltdl/m4/ltversion.m4 squid-3.4.4.1/libltdl/m4/ltversion.m4 --- squid-3.4.4/libltdl/m4/ltversion.m4 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/m4/ltversion.m4 2014-04-23 05:50:43.000000000 -0700 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3175 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.10]) -m4_define([LT_PACKAGE_REVISION], [1.3175]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.10' -macro_revision='1.3175' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -u -r -N squid-3.4.4/libltdl/Makefile.am squid-3.4.4.1/libltdl/Makefile.am --- squid-3.4.4/libltdl/Makefile.am 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/Makefile.am 2014-04-23 05:50:45.000000000 -0700 @@ -47,7 +47,7 @@ -DLTDL -I. -I$(srcdir) -Ilibltdl \ -I$(srcdir)/libltdl -I$(srcdir)/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 9:2:2 +LTDL_VERSION_INFO = -version-info 10:0:3 noinst_LTLIBRARIES += $(LT_DLLOADERS) diff -u -r -N squid-3.4.4/libltdl/Makefile.in squid-3.4.4.1/libltdl/Makefile.in --- squid-3.4.4/libltdl/Makefile.in 2014-03-09 01:41:35.000000000 -0800 +++ squid-3.4.4.1/libltdl/Makefile.in 2014-04-23 05:50:50.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,6 +18,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,13 +85,18 @@ @INSTALL_LTDL_TRUE@am__append_2 = libltdl.la @CONVENIENCE_LTDL_TRUE@am__append_3 = libltdlc.la subdir = . -DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ - $(am__ltdlinclude_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config-h.in \ - $(top_srcdir)/configure argz.c config/compile \ - config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh \ - config/missing lt__dirent.c lt__strl.c +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config-h.in argz.c lt__dirent.c lt__strl.c \ + $(top_srcdir)/config/depcomp $(am__include_HEADERS_DIST) \ + $(am__ltdlinclude_HEADERS_DIST) README \ + config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh \ + config/missing config/ltmain.sh \ + $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ + $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ @@ -83,33 +132,43 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ "$(DESTDIR)$(ltdlincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) dld_link_la_DEPENDENCIES = am_dld_link_la_OBJECTS = dld_link.lo dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS) -dld_link_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@ am__DEPENDENCIES_1 = dlopen_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_dlopen_la_OBJECTS = dlopen.lo dlopen_la_OBJECTS = $(am_dlopen_la_OBJECTS) -dlopen_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +dlopen_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(dlopen_la_LDFLAGS) $(LDFLAGS) -o $@ dyld_la_LIBADD = am_dyld_la_OBJECTS = dyld.lo dyld_la_OBJECTS = $(am_dyld_la_OBJECTS) -dyld_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dyld_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +dyld_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(dyld_la_LDFLAGS) $(LDFLAGS) -o $@ am_libltdl_la_OBJECTS = libltdl_la-preopen.lo libltdl_la-lt__alloc.lo \ libltdl_la-lt_dlloader.lo libltdl_la-lt_error.lo \ libltdl_la-ltdl.lo libltdl_la-slist.lo libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) -libltdl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libltdl_la_LDFLAGS) $(LDFLAGS) -o $@ @INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir) @@ -118,41 +177,64 @@ libltdlc_la-ltdl.lo libltdlc_la-slist.lo am_libltdlc_la_OBJECTS = $(am__objects_1) libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) -libltdlc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libltdlc_la_LDFLAGS) $(LDFLAGS) -o $@ @CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath = load_add_on_la_LIBADD = am_load_add_on_la_OBJECTS = load_add_on.lo load_add_on_la_OBJECTS = $(am_load_add_on_la_OBJECTS) -load_add_on_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(load_add_on_la_LDFLAGS) $(LDFLAGS) -o $@ +load_add_on_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(load_add_on_la_LDFLAGS) $(LDFLAGS) -o \ + $@ loadlibrary_la_LIBADD = am_loadlibrary_la_OBJECTS = loadlibrary.lo loadlibrary_la_OBJECTS = $(am_loadlibrary_la_OBJECTS) -loadlibrary_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(loadlibrary_la_LDFLAGS) $(LDFLAGS) -o $@ +loadlibrary_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(loadlibrary_la_LDFLAGS) $(LDFLAGS) -o \ + $@ shl_load_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_shl_load_la_OBJECTS = shl_load.lo shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS) -shl_load_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(shl_load_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \ $(dyld_la_SOURCES) $(libltdl_la_SOURCES) \ $(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \ @@ -161,25 +243,57 @@ $(dyld_la_SOURCES) $(libltdl_la_SOURCES) \ $(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \ $(loadlibrary_la_SOURCES) $(shl_load_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__include_HEADERS_DIST = ltdl.h am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \ libltdl/lt_dlloader.h HEADERS = $(include_HEADERS) $(ltdlinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config-h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope +AM_RECURSIVE_TARGETS = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AS = @AS@ @@ -227,6 +341,7 @@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -252,6 +367,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -320,7 +436,7 @@ CLEANFILES = libltdl.la libltdlc.la libdlloader.la $(LIBOBJS) \ $(LTLIBOBJS) MOSTLYCLEANFILES = argz.h argz.h-t -LTDL_VERSION_INFO = -version-info 9:2:2 +LTDL_VERSION_INFO = -version-info 10:0:3 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/lt_system.h \ @INSTALL_LTDL_TRUE@ libltdl/lt_error.h \ @@ -372,7 +488,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -401,24 +517,29 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck +$(top_srcdir)/configure: $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config-h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config-h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -426,6 +547,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -441,37 +564,49 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) - $(dld_link_la_LINK) $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS) -dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) - $(dlopen_la_LINK) $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS) -dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) - $(dyld_la_LINK) $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS) -libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) - $(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) -libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) - $(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) -load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) - $(load_add_on_la_LINK) $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS) -loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) - $(loadlibrary_la_LINK) $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS) -shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) - $(shl_load_la_LINK) $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) $(EXTRA_dld_link_la_DEPENDENCIES) + $(AM_V_CCLD)$(dld_link_la_LINK) $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS) + +dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) $(EXTRA_dlopen_la_DEPENDENCIES) + $(AM_V_CCLD)$(dlopen_la_LINK) $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS) + +dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) $(EXTRA_dyld_la_DEPENDENCIES) + $(AM_V_CCLD)$(dyld_la_LINK) $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS) + +libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) $(EXTRA_libltdl_la_DEPENDENCIES) + $(AM_V_CCLD)$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) + +libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) $(EXTRA_libltdlc_la_DEPENDENCIES) + $(AM_V_CCLD)$(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) + +load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) $(EXTRA_load_add_on_la_DEPENDENCIES) + $(AM_V_CCLD)$(load_add_on_la_LINK) $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS) + +loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) $(EXTRA_loadlibrary_la_DEPENDENCIES) + $(AM_V_CCLD)$(loadlibrary_la_LINK) $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS) + +shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) $(EXTRA_shl_load_la_DEPENDENCIES) + $(AM_V_CCLD)$(shl_load_la_LINK) $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -502,151 +637,151 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shl_load.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< dld_link.lo: loaders/dld_link.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dld_link.lo -MD -MP -MF $(DEPDIR)/dld_link.Tpo -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dld_link.Tpo $(DEPDIR)/dld_link.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/dld_link.c' object='dld_link.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dld_link.lo -MD -MP -MF $(DEPDIR)/dld_link.Tpo -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dld_link.Tpo $(DEPDIR)/dld_link.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/dld_link.c' object='dld_link.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dld_link.lo `test -f 'loaders/dld_link.c' || echo '$(srcdir)/'`loaders/dld_link.c dlopen.lo: loaders/dlopen.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dlopen.lo -MD -MP -MF $(DEPDIR)/dlopen.Tpo -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dlopen.Tpo $(DEPDIR)/dlopen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/dlopen.c' object='dlopen.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dlopen.lo -MD -MP -MF $(DEPDIR)/dlopen.Tpo -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dlopen.Tpo $(DEPDIR)/dlopen.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/dlopen.c' object='dlopen.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dlopen.lo `test -f 'loaders/dlopen.c' || echo '$(srcdir)/'`loaders/dlopen.c dyld.lo: loaders/dyld.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dyld.lo -MD -MP -MF $(DEPDIR)/dyld.Tpo -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dyld.Tpo $(DEPDIR)/dyld.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/dyld.c' object='dyld.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dyld.lo -MD -MP -MF $(DEPDIR)/dyld.Tpo -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dyld.Tpo $(DEPDIR)/dyld.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/dyld.c' object='dyld.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dyld.lo `test -f 'loaders/dyld.c' || echo '$(srcdir)/'`loaders/dyld.c libltdl_la-preopen.lo: loaders/preopen.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdl_la-preopen.Tpo -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-preopen.Tpo $(DEPDIR)/libltdl_la-preopen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/preopen.c' object='libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdl_la-preopen.Tpo -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-preopen.Tpo $(DEPDIR)/libltdl_la-preopen.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/preopen.c' object='libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c libltdl_la-lt__alloc.lo: lt__alloc.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt__alloc.Tpo -c -o libltdl_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-lt__alloc.Tpo $(DEPDIR)/libltdl_la-lt__alloc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt__alloc.c' object='libltdl_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt__alloc.Tpo -c -o libltdl_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-lt__alloc.Tpo $(DEPDIR)/libltdl_la-lt__alloc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt__alloc.c' object='libltdl_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c libltdl_la-lt_dlloader.lo: lt_dlloader.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt_dlloader.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt_dlloader.Tpo -c -o libltdl_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-lt_dlloader.Tpo $(DEPDIR)/libltdl_la-lt_dlloader.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt_dlloader.c' object='libltdl_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt_dlloader.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt_dlloader.Tpo -c -o libltdl_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-lt_dlloader.Tpo $(DEPDIR)/libltdl_la-lt_dlloader.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt_dlloader.c' object='libltdl_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c libltdl_la-lt_error.lo: lt_error.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt_error.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt_error.Tpo -c -o libltdl_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-lt_error.Tpo $(DEPDIR)/libltdl_la-lt_error.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt_error.c' object='libltdl_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-lt_error.lo -MD -MP -MF $(DEPDIR)/libltdl_la-lt_error.Tpo -c -o libltdl_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-lt_error.Tpo $(DEPDIR)/libltdl_la-lt_error.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt_error.c' object='libltdl_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c libltdl_la-ltdl.lo: ltdl.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-ltdl.lo -MD -MP -MF $(DEPDIR)/libltdl_la-ltdl.Tpo -c -o libltdl_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-ltdl.Tpo $(DEPDIR)/libltdl_la-ltdl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl.c' object='libltdl_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-ltdl.lo -MD -MP -MF $(DEPDIR)/libltdl_la-ltdl.Tpo -c -o libltdl_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-ltdl.Tpo $(DEPDIR)/libltdl_la-ltdl.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ltdl.c' object='libltdl_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c libltdl_la-slist.lo: slist.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-slist.lo -MD -MP -MF $(DEPDIR)/libltdl_la-slist.Tpo -c -o libltdl_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdl_la-slist.Tpo $(DEPDIR)/libltdl_la-slist.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='slist.c' object='libltdl_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdl_la-slist.lo -MD -MP -MF $(DEPDIR)/libltdl_la-slist.Tpo -c -o libltdl_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdl_la-slist.Tpo $(DEPDIR)/libltdl_la-slist.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='slist.c' object='libltdl_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdl_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c libltdlc_la-preopen.lo: loaders/preopen.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-preopen.Tpo -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-preopen.Tpo $(DEPDIR)/libltdlc_la-preopen.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/preopen.c' object='libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-preopen.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-preopen.Tpo -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-preopen.Tpo $(DEPDIR)/libltdlc_la-preopen.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/preopen.c' object='libltdlc_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-preopen.lo `test -f 'loaders/preopen.c' || echo '$(srcdir)/'`loaders/preopen.c libltdlc_la-lt__alloc.lo: lt__alloc.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt__alloc.Tpo -c -o libltdlc_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-lt__alloc.Tpo $(DEPDIR)/libltdlc_la-lt__alloc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt__alloc.c' object='libltdlc_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt__alloc.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt__alloc.Tpo -c -o libltdlc_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-lt__alloc.Tpo $(DEPDIR)/libltdlc_la-lt__alloc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt__alloc.c' object='libltdlc_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt__alloc.lo `test -f 'lt__alloc.c' || echo '$(srcdir)/'`lt__alloc.c libltdlc_la-lt_dlloader.lo: lt_dlloader.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt_dlloader.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt_dlloader.Tpo -c -o libltdlc_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-lt_dlloader.Tpo $(DEPDIR)/libltdlc_la-lt_dlloader.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt_dlloader.c' object='libltdlc_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt_dlloader.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt_dlloader.Tpo -c -o libltdlc_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-lt_dlloader.Tpo $(DEPDIR)/libltdlc_la-lt_dlloader.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt_dlloader.c' object='libltdlc_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt_dlloader.lo `test -f 'lt_dlloader.c' || echo '$(srcdir)/'`lt_dlloader.c libltdlc_la-lt_error.lo: lt_error.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt_error.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt_error.Tpo -c -o libltdlc_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-lt_error.Tpo $(DEPDIR)/libltdlc_la-lt_error.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lt_error.c' object='libltdlc_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-lt_error.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-lt_error.Tpo -c -o libltdlc_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-lt_error.Tpo $(DEPDIR)/libltdlc_la-lt_error.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lt_error.c' object='libltdlc_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-lt_error.lo `test -f 'lt_error.c' || echo '$(srcdir)/'`lt_error.c libltdlc_la-ltdl.lo: ltdl.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-ltdl.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-ltdl.Tpo -c -o libltdlc_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-ltdl.Tpo $(DEPDIR)/libltdlc_la-ltdl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl.c' object='libltdlc_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-ltdl.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-ltdl.Tpo -c -o libltdlc_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-ltdl.Tpo $(DEPDIR)/libltdlc_la-ltdl.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ltdl.c' object='libltdlc_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-ltdl.lo `test -f 'ltdl.c' || echo '$(srcdir)/'`ltdl.c libltdlc_la-slist.lo: slist.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-slist.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-slist.Tpo -c -o libltdlc_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libltdlc_la-slist.Tpo $(DEPDIR)/libltdlc_la-slist.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='slist.c' object='libltdlc_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libltdlc_la-slist.lo -MD -MP -MF $(DEPDIR)/libltdlc_la-slist.Tpo -c -o libltdlc_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libltdlc_la-slist.Tpo $(DEPDIR)/libltdlc_la-slist.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='slist.c' object='libltdlc_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libltdlc_la-slist.lo `test -f 'slist.c' || echo '$(srcdir)/'`slist.c load_add_on.lo: loaders/load_add_on.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load_add_on.lo -MD -MP -MF $(DEPDIR)/load_add_on.Tpo -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/load_add_on.Tpo $(DEPDIR)/load_add_on.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/load_add_on.c' object='load_add_on.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load_add_on.lo -MD -MP -MF $(DEPDIR)/load_add_on.Tpo -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/load_add_on.Tpo $(DEPDIR)/load_add_on.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/load_add_on.c' object='load_add_on.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load_add_on.lo `test -f 'loaders/load_add_on.c' || echo '$(srcdir)/'`loaders/load_add_on.c loadlibrary.lo: loaders/loadlibrary.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadlibrary.lo -MD -MP -MF $(DEPDIR)/loadlibrary.Tpo -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadlibrary.Tpo $(DEPDIR)/loadlibrary.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/loadlibrary.c' object='loadlibrary.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadlibrary.lo -MD -MP -MF $(DEPDIR)/loadlibrary.Tpo -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadlibrary.Tpo $(DEPDIR)/loadlibrary.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/loadlibrary.c' object='loadlibrary.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadlibrary.lo `test -f 'loaders/loadlibrary.c' || echo '$(srcdir)/'`loaders/loadlibrary.c shl_load.lo: loaders/shl_load.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shl_load.lo -MD -MP -MF $(DEPDIR)/shl_load.Tpo -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shl_load.Tpo $(DEPDIR)/shl_load.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loaders/shl_load.c' object='shl_load.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shl_load.lo -MD -MP -MF $(DEPDIR)/shl_load.Tpo -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shl_load.Tpo $(DEPDIR)/shl_load.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loaders/shl_load.c' object='shl_load.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shl_load.lo `test -f 'loaders/shl_load.c' || echo '$(srcdir)/'`loaders/shl_load.c mostlyclean-libtool: -rm -f *.lo @@ -658,8 +793,11 @@ -rm -f libtool config.lt install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -673,13 +811,14 @@ @$(NORMAL_UNINSTALL) @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" @list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(ltdlincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -693,30 +832,17 @@ @$(NORMAL_UNINSTALL) @list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(ltdlincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(ltdlincludedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(ltdlincludedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -728,15 +854,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -745,9 +867,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -790,36 +934,42 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -830,8 +980,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -841,17 +991,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -874,13 +1026,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -915,10 +1075,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -1010,23 +1175,24 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLTLIBRARIES ctags dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ + clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ + dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-includeHEADERS install-info \ + install-info-am install-libLTLIBRARIES \ install-ltdlincludeHEADERS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-includeHEADERS \ + tags tags-am uninstall uninstall-am uninstall-includeHEADERS \ uninstall-libLTLIBRARIES uninstall-ltdlincludeHEADERS diff -u -r -N squid-3.4.4/libltdl/README squid-3.4.4.1/libltdl/README --- squid-3.4.4/libltdl/README 2014-03-09 01:41:33.000000000 -0800 +++ squid-3.4.4.1/libltdl/README 2014-04-23 05:50:45.000000000 -0700 @@ -1,15 +1,15 @@ This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. It supports the following dlopen interfaces: -* dlopen (Solaris, Linux and various BSD flavors) +* dlopen (POSIX) * shl_load (HP-UX) * LoadLibrary (Win16 and Win32) * load_add_on (BeOS) * GNU DLD (emulates dynamic linking for static libraries) * dyld (darwin/Mac OS X) * libtool's dlpreopen --- - Copyright (C) 1999, 2003 Free Software Foundation, Inc. +-- + Copyright (C) 1999, 2003, 2011 Free Software Foundation, Inc. Written by Thomas Tanner, 1999 This file is part of GNU Libtool. diff -u -r -N squid-3.4.4/Makefile.in squid-3.4.4.1/Makefile.in --- squid-3.4.4/Makefile.in 2014-03-09 01:41:58.000000000 -0800 +++ squid-3.4.4.1/Makefile.in 2014-04-23 05:50:59.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ # VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,12 +81,15 @@ host_triplet = @host@ @USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/include/autoconf.h.in COPYING ChangeLog INSTALL \ - cfgaux/compile cfgaux/config.guess cfgaux/config.sub \ - cfgaux/depcomp cfgaux/install-sh cfgaux/ltmain.sh \ - cfgaux/missing + README cfgaux/compile cfgaux/config.guess cfgaux/config.sub \ + cfgaux/install-sh cfgaux/missing cfgaux/ltmain.sh \ + $(top_srcdir)/cfgaux/compile $(top_srcdir)/cfgaux/config.guess \ + $(top_srcdir)/cfgaux/config.sub \ + $(top_srcdir)/cfgaux/install-sh $(top_srcdir)/cfgaux/ltmain.sh \ + $(top_srcdir)/cfgaux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -51,7 +98,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -108,29 +155,71 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -158,12 +247,16 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -202,6 +295,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -219,6 +313,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -256,11 +351,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -319,6 +416,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -395,7 +493,7 @@ all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -431,10 +529,8 @@ $(am__aclocal_m4_deps): include/autoconf.h: include/stamp-h1 - @if test ! -f $@; then \ - rm -f include/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; \ - else :; fi + @test -f $@ || rm -f include/stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1 include/stamp-h1: $(top_srcdir)/include/autoconf.h.in $(top_builddir)/config.status @rm -f include/stamp-h1 @@ -457,22 +553,25 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -487,57 +586,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -553,12 +607,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -570,15 +619,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -587,9 +632,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -625,13 +692,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -663,36 +727,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -703,8 +772,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -714,17 +783,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -747,13 +818,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -784,10 +863,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -870,24 +954,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am dist-hook: diff -u -r -N squid-3.4.4/RELEASENOTES.html squid-3.4.4.1/RELEASENOTES.html --- squid-3.4.4/RELEASENOTES.html 2014-03-09 03:05:16.000000000 -0700 +++ squid-3.4.4.1/RELEASENOTES.html 2014-04-23 06:01:42.000000000 -0700 @@ -2,10 +2,10 @@ - Squid 3.4.4 release notes + Squid 3.4.4.1 release notes -

    Squid 3.4.4 release notes

    +

    Squid 3.4.4.1 release notes

    Squid Developers

    @@ -57,7 +57,7 @@

    1. Notice

    -

    The Squid Team are pleased to announce the release of Squid-3.4.4 for testing.

    +

    The Squid Team are pleased to announce the release of Squid-3.4.4.1 for testing.

    This new release is available for download from http://www.squid-cache.org/Versions/v3/3.4/ or the mirrors.

    diff -u -r -N squid-3.4.4/scripts/Makefile.in squid-3.4.4.1/scripts/Makefile.in --- squid-3.4.4/scripts/Makefile.in 2014-03-09 01:41:50.000000000 -0800 +++ squid-3.4.4.1/scripts/Makefile.in 2014-04-23 05:51:20.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = scripts -DIST_COMMON = $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_noinst_SCRIPTS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -45,7 +89,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -101,13 +145,32 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SCRIPTS = $(dist_noinst_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -146,6 +209,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -163,6 +227,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -200,11 +265,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -263,6 +330,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -364,11 +432,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -415,10 +483,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -499,15 +572,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/snmplib/Makefile.in squid-3.4.4.1/snmplib/Makefile.in --- squid-3.4.4/snmplib/Makefile.in 2014-03-09 01:41:50.000000000 -0800 +++ squid-3.4.4.1/snmplib/Makefile.in 2014-04-23 05:51:20.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = snmplib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/cfgaux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \ $(top_srcdir)/acinclude/squid-util.m4 \ @@ -44,7 +89,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -105,21 +150,68 @@ coexistance.lo snmp_api.lo snmp_error.lo mib.lo \ snmp_api_error.lo snmp_msg.lo snmp_pdu.lo snmplib_debug.lo libsnmplib_la_OBJECTS = $(am_libsnmplib_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsnmplib_la_SOURCES) DIST_SOURCES = $(libsnmplib_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -127,6 +219,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -165,6 +258,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -182,6 +276,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -219,11 +314,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -282,6 +379,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -387,14 +485,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsnmplib.la: $(libsnmplib_la_OBJECTS) $(libsnmplib_la_DEPENDENCIES) - $(LINK) $(libsnmplib_la_OBJECTS) $(libsnmplib_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsnmplib.la: $(libsnmplib_la_OBJECTS) $(libsnmplib_la_DEPENDENCIES) $(EXTRA_libsnmplib_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libsnmplib_la_OBJECTS) $(libsnmplib_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -415,25 +516,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snmplib_debug.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -441,26 +542,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -472,15 +562,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -489,6 +575,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -537,10 +638,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -625,18 +731,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r -N squid-3.4.4/src/acl/Makefile.in squid-3.4.4.1/src/acl/Makefile.in --- squid-3.4.4/src/acl/Makefile.in 2014-03-09 01:41:52.000000000 -0800 +++ squid-3.4.4.1/src/acl/Makefile.in 2014-04-23 05:51:24.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @ENABLE_SSL_TRUE@am__append_2 = $(SSL_ACLS) @@ -49,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -147,6 +193,10 @@ SourceIp.lo Tag.lo Url.lo UrlLogin.lo UrlPath.lo UrlPort.lo \ UserData.lo Gadgets.lo $(am__objects_2) $(am__objects_4) libacls_la_OBJECTS = $(am_libacls_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libapi_la_LIBADD = am_libapi_la_OBJECTS = Acl.lo BoolOps.lo Checklist.lo InnerNode.lo \ Tree.lo @@ -155,42 +205,297 @@ am_libstate_la_OBJECTS = Strategised.lo FilledChecklist.lo \ AclAddress.lo libstate_la_OBJECTS = $(am_libstate_la_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libacls_la_SOURCES) $(EXTRA_libacls_la_SOURCES) \ $(libapi_la_SOURCES) $(libstate_la_SOURCES) DIST_SOURCES = $(am__libacls_la_SOURCES_DIST) \ $(EXTRA_libacls_la_SOURCES) $(libapi_la_SOURCES) \ $(libstate_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -229,6 +534,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -246,6 +552,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -283,11 +590,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -346,6 +655,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -474,7 +784,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -496,6 +806,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -508,18 +819,23 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libacls.la: $(libacls_la_OBJECTS) $(libacls_la_DEPENDENCIES) - $(CXXLINK) $(libacls_la_OBJECTS) $(libacls_la_LIBADD) $(LIBS) -libapi.la: $(libapi_la_OBJECTS) $(libapi_la_DEPENDENCIES) - $(CXXLINK) $(libapi_la_OBJECTS) $(libapi_la_LIBADD) $(LIBS) -libstate.la: $(libstate_la_OBJECTS) $(libstate_la_DEPENDENCIES) - $(CXXLINK) $(libstate_la_OBJECTS) $(libstate_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libacls.la: $(libacls_la_OBJECTS) $(libacls_la_DEPENDENCIES) $(EXTRA_libacls_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libacls_la_OBJECTS) $(libacls_la_LIBADD) $(LIBS) + +libapi.la: $(libapi_la_OBJECTS) $(libapi_la_DEPENDENCIES) $(EXTRA_libapi_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libapi_la_OBJECTS) $(libapi_la_LIBADD) $(LIBS) + +libstate.la: $(libstate_la_OBJECTS) $(libstate_la_DEPENDENCIES) $(EXTRA_libstate_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libstate_la_OBJECTS) $(libstate_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -597,25 +913,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UserData.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -623,26 +939,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -654,15 +959,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -671,101 +972,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -813,11 +1200,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -902,19 +1297,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/adaptation/ecap/Makefile.in squid-3.4.4.1/src/adaptation/ecap/Makefile.in --- squid-3.4.4/src/adaptation/ecap/Makefile.in 2014-03-09 01:41:52.000000000 -0800 +++ squid-3.4.4.1/src/adaptation/ecap/Makefile.in 2014-04-23 05:51:25.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/adaptation/ecap @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -109,43 +155,302 @@ libsquid_ecap_la-Host.lo libsquid_ecap_la-MessageRep.lo \ libsquid_ecap_la-ServiceRep.lo libsquid_ecap_la-XactionRep.lo libsquid_ecap_la_OBJECTS = $(am_libsquid_ecap_la_OBJECTS) -libsquid_ecap_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libsquid_ecap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsquid_ecap_la_SOURCES) DIST_SOURCES = $(libsquid_ecap_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -184,6 +489,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -201,6 +507,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -238,11 +545,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -301,6 +610,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -388,7 +698,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,6 +720,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -422,14 +733,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsquid-ecap.la: $(libsquid_ecap_la_OBJECTS) $(libsquid_ecap_la_DEPENDENCIES) - $(libsquid_ecap_la_LINK) $(libsquid_ecap_la_OBJECTS) $(libsquid_ecap_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsquid-ecap.la: $(libsquid_ecap_la_OBJECTS) $(libsquid_ecap_la_DEPENDENCIES) $(EXTRA_libsquid_ecap_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libsquid_ecap_la_LINK) $(libsquid_ecap_la_OBJECTS) $(libsquid_ecap_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -453,60 +767,60 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsquid_ecap_la-XactionRep.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< libsquid_ecap_la-Config.lo: Config.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-Config.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-Config.Tpo -c -o libsquid_ecap_la-Config.lo `test -f 'Config.cc' || echo '$(srcdir)/'`Config.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsquid_ecap_la-Config.Tpo $(DEPDIR)/libsquid_ecap_la-Config.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Config.cc' object='libsquid_ecap_la-Config.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-Config.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-Config.Tpo -c -o libsquid_ecap_la-Config.lo `test -f 'Config.cc' || echo '$(srcdir)/'`Config.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsquid_ecap_la-Config.Tpo $(DEPDIR)/libsquid_ecap_la-Config.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Config.cc' object='libsquid_ecap_la-Config.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-Config.lo `test -f 'Config.cc' || echo '$(srcdir)/'`Config.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-Config.lo `test -f 'Config.cc' || echo '$(srcdir)/'`Config.cc libsquid_ecap_la-Host.lo: Host.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-Host.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-Host.Tpo -c -o libsquid_ecap_la-Host.lo `test -f 'Host.cc' || echo '$(srcdir)/'`Host.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsquid_ecap_la-Host.Tpo $(DEPDIR)/libsquid_ecap_la-Host.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Host.cc' object='libsquid_ecap_la-Host.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-Host.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-Host.Tpo -c -o libsquid_ecap_la-Host.lo `test -f 'Host.cc' || echo '$(srcdir)/'`Host.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsquid_ecap_la-Host.Tpo $(DEPDIR)/libsquid_ecap_la-Host.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Host.cc' object='libsquid_ecap_la-Host.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-Host.lo `test -f 'Host.cc' || echo '$(srcdir)/'`Host.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-Host.lo `test -f 'Host.cc' || echo '$(srcdir)/'`Host.cc libsquid_ecap_la-MessageRep.lo: MessageRep.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-MessageRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-MessageRep.Tpo -c -o libsquid_ecap_la-MessageRep.lo `test -f 'MessageRep.cc' || echo '$(srcdir)/'`MessageRep.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsquid_ecap_la-MessageRep.Tpo $(DEPDIR)/libsquid_ecap_la-MessageRep.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MessageRep.cc' object='libsquid_ecap_la-MessageRep.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-MessageRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-MessageRep.Tpo -c -o libsquid_ecap_la-MessageRep.lo `test -f 'MessageRep.cc' || echo '$(srcdir)/'`MessageRep.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsquid_ecap_la-MessageRep.Tpo $(DEPDIR)/libsquid_ecap_la-MessageRep.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='MessageRep.cc' object='libsquid_ecap_la-MessageRep.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-MessageRep.lo `test -f 'MessageRep.cc' || echo '$(srcdir)/'`MessageRep.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-MessageRep.lo `test -f 'MessageRep.cc' || echo '$(srcdir)/'`MessageRep.cc libsquid_ecap_la-ServiceRep.lo: ServiceRep.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-ServiceRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-ServiceRep.Tpo -c -o libsquid_ecap_la-ServiceRep.lo `test -f 'ServiceRep.cc' || echo '$(srcdir)/'`ServiceRep.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsquid_ecap_la-ServiceRep.Tpo $(DEPDIR)/libsquid_ecap_la-ServiceRep.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ServiceRep.cc' object='libsquid_ecap_la-ServiceRep.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-ServiceRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-ServiceRep.Tpo -c -o libsquid_ecap_la-ServiceRep.lo `test -f 'ServiceRep.cc' || echo '$(srcdir)/'`ServiceRep.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsquid_ecap_la-ServiceRep.Tpo $(DEPDIR)/libsquid_ecap_la-ServiceRep.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ServiceRep.cc' object='libsquid_ecap_la-ServiceRep.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-ServiceRep.lo `test -f 'ServiceRep.cc' || echo '$(srcdir)/'`ServiceRep.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-ServiceRep.lo `test -f 'ServiceRep.cc' || echo '$(srcdir)/'`ServiceRep.cc libsquid_ecap_la-XactionRep.lo: XactionRep.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-XactionRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-XactionRep.Tpo -c -o libsquid_ecap_la-XactionRep.lo `test -f 'XactionRep.cc' || echo '$(srcdir)/'`XactionRep.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsquid_ecap_la-XactionRep.Tpo $(DEPDIR)/libsquid_ecap_la-XactionRep.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XactionRep.cc' object='libsquid_ecap_la-XactionRep.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -MT libsquid_ecap_la-XactionRep.lo -MD -MP -MF $(DEPDIR)/libsquid_ecap_la-XactionRep.Tpo -c -o libsquid_ecap_la-XactionRep.lo `test -f 'XactionRep.cc' || echo '$(srcdir)/'`XactionRep.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsquid_ecap_la-XactionRep.Tpo $(DEPDIR)/libsquid_ecap_la-XactionRep.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XactionRep.cc' object='libsquid_ecap_la-XactionRep.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-XactionRep.lo `test -f 'XactionRep.cc' || echo '$(srcdir)/'`XactionRep.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsquid_ecap_la_CXXFLAGS) $(CXXFLAGS) -c -o libsquid_ecap_la-XactionRep.lo `test -f 'XactionRep.cc' || echo '$(srcdir)/'`XactionRep.cc mostlyclean-libtool: -rm -f *.lo @@ -514,26 +828,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -545,15 +848,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -562,101 +861,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -704,11 +1089,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -793,19 +1186,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/adaptation/icap/Makefile.in squid-3.4.4.1/src/adaptation/icap/Makefile.in --- squid-3.4.4/src/adaptation/icap/Makefile.in 2014-03-09 01:41:52.000000000 -0800 +++ squid-3.4.4.1/src/adaptation/icap/Makefile.in 2014-04-23 05:51:25.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/adaptation/icap @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -108,39 +154,298 @@ ServiceRep.lo Launcher.lo OptXact.lo Xaction.lo ModXact.lo \ icap_log.lo History.lo libicap_la_OBJECTS = $(am_libicap_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libicap_la_SOURCES) DIST_SOURCES = $(libicap_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -179,6 +484,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -196,6 +502,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -233,11 +540,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -296,6 +605,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -390,7 +700,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -412,6 +722,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -424,14 +735,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libicap.la: $(libicap_la_OBJECTS) $(libicap_la_DEPENDENCIES) - $(CXXLINK) $(libicap_la_OBJECTS) $(libicap_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libicap.la: $(libicap_la_OBJECTS) $(libicap_la_DEPENDENCIES) $(EXTRA_libicap_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libicap_la_OBJECTS) $(libicap_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -461,25 +775,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icap_log.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -487,26 +801,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -518,15 +821,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -535,101 +834,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -677,11 +1062,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -766,19 +1159,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/adaptation/Makefile.in squid-3.4.4.1/src/adaptation/Makefile.in --- squid-3.4.4/src/adaptation/Makefile.in 2014-03-09 01:41:52.000000000 -0800 +++ squid-3.4.4.1/src/adaptation/Makefile.in 2014-04-23 05:51:24.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @USE_ICAP_CLIENT_TRUE@am__append_2 = icap @@ -49,7 +95,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -111,46 +157,307 @@ Initiator.lo Iterator.lo Message.lo Service.lo \ ServiceConfig.lo ServiceGroups.lo ServiceFilter.lo History.lo libadaptation_la_OBJECTS = $(am_libadaptation_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libadaptation_la_SOURCES) DIST_SOURCES = $(libadaptation_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = icap ecap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -182,6 +489,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -220,6 +528,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -237,6 +546,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -274,11 +584,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -337,6 +649,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -444,7 +757,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -466,6 +779,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -478,14 +792,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libadaptation.la: $(libadaptation_la_OBJECTS) $(libadaptation_la_DEPENDENCIES) - $(CXXLINK) $(libadaptation_la_OBJECTS) $(libadaptation_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libadaptation.la: $(libadaptation_la_OBJECTS) $(libadaptation_la_DEPENDENCIES) $(EXTRA_libadaptation_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libadaptation_la_OBJECTS) $(libadaptation_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -519,25 +836,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceGroups.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -546,22 +863,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -576,57 +896,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -642,12 +917,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -659,15 +929,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -676,101 +942,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -804,13 +1156,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -847,11 +1196,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -934,24 +1291,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/anyp/Makefile.in squid-3.4.4.1/src/anyp/Makefile.in --- squid-3.4.4/src/anyp/Makefile.in 2014-03-09 01:41:53.000000000 -0800 +++ squid-3.4.4.1/src/anyp/Makefile.in 2014-04-23 05:51:25.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/anyp @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,39 +152,298 @@ libanyp_la_LIBADD = am_libanyp_la_OBJECTS = PortCfg.lo ProtocolType.lo libanyp_la_OBJECTS = $(am_libanyp_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libanyp_la_SOURCES) DIST_SOURCES = $(libanyp_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +482,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +500,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +538,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +603,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -372,7 +682,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -394,6 +704,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -406,14 +717,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libanyp.la: $(libanyp_la_OBJECTS) $(libanyp_la_DEPENDENCIES) - $(CXXLINK) $(libanyp_la_OBJECTS) $(libanyp_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libanyp.la: $(libanyp_la_OBJECTS) $(libanyp_la_DEPENDENCIES) $(EXTRA_libanyp_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libanyp_la_OBJECTS) $(libanyp_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -434,25 +748,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProtocolType.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -460,26 +774,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -491,15 +794,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -508,101 +807,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -650,11 +1035,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -739,19 +1132,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/auth/AclProxyAuth.cc squid-3.4.4.1/src/auth/AclProxyAuth.cc --- squid-3.4.4/src/auth/AclProxyAuth.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/auth/AclProxyAuth.cc 2014-04-23 05:50:18.000000000 -0700 @@ -189,6 +189,8 @@ ACLProxyAuth::matchProxyAuth(ACLChecklist *cl) { ACLFilledChecklist *checklist = Filled(cl); + if (checklist->request->flags.sslBumped) + return 1; // AuthenticateAcl() already handled this bumped request if (!authenticateUserAuthenticated(Filled(checklist)->auth_user_request)) { return 0; } diff -u -r -N squid-3.4.4/src/auth/basic/Makefile.in squid-3.4.4.1/src/auth/basic/Makefile.in --- squid-3.4.4/src/auth/basic/Makefile.in 2014-03-09 01:41:53.000000000 -0800 +++ squid-3.4.4.1/src/auth/basic/Makefile.in 2014-04-23 05:51:27.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/basic @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libbasic_la_OBJECTS = Scheme.lo auth_basic.lo User.lo \ UserRequest.lo libbasic_la_OBJECTS = $(am_libbasic_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libbasic_la_SOURCES) DIST_SOURCES = $(libbasic_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -374,7 +684,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -396,6 +706,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,14 +719,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libbasic.la: $(libbasic_la_OBJECTS) $(libbasic_la_DEPENDENCIES) - $(CXXLINK) $(libbasic_la_OBJECTS) $(libbasic_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libbasic.la: $(libbasic_la_OBJECTS) $(libbasic_la_DEPENDENCIES) $(EXTRA_libbasic_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libbasic_la_OBJECTS) $(libbasic_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -438,25 +752,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_basic.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -464,26 +778,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -495,15 +798,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -512,101 +811,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -654,11 +1039,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -743,19 +1136,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/auth/digest/Makefile.in squid-3.4.4.1/src/auth/digest/Makefile.in --- squid-3.4.4/src/auth/digest/Makefile.in 2014-03-09 01:41:53.000000000 -0800 +++ squid-3.4.4.1/src/auth/digest/Makefile.in 2014-04-23 05:51:27.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/digest @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libdigest_la_OBJECTS = Scheme.lo auth_digest.lo User.lo \ UserRequest.lo libdigest_la_OBJECTS = $(am_libdigest_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libdigest_la_SOURCES) DIST_SOURCES = $(libdigest_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -374,7 +684,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -396,6 +706,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,14 +719,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libdigest.la: $(libdigest_la_OBJECTS) $(libdigest_la_DEPENDENCIES) - $(CXXLINK) $(libdigest_la_OBJECTS) $(libdigest_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libdigest.la: $(libdigest_la_OBJECTS) $(libdigest_la_DEPENDENCIES) $(EXTRA_libdigest_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libdigest_la_OBJECTS) $(libdigest_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -438,25 +752,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_digest.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -464,26 +778,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -495,15 +798,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -512,101 +811,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -654,11 +1039,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -743,19 +1136,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/auth/Makefile.in squid-3.4.4.1/src/auth/Makefile.in --- squid-3.4.4/src/auth/Makefile.in 2014-03-09 01:41:53.000000000 -0800 +++ squid-3.4.4.1/src/auth/Makefile.in 2014-04-23 05:51:26.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,50 +152,311 @@ libacls_la_LIBADD = am_libacls_la_OBJECTS = Acl.lo AclMaxUserIp.lo AclProxyAuth.lo libacls_la_OBJECTS = $(am_libacls_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am__DEPENDENCIES_1 = am_libauth_la_OBJECTS = Type.lo Config.lo CredentialState.lo \ Gadgets.lo Scheme.lo State.lo User.lo UserRequest.lo libauth_la_OBJECTS = $(am_libauth_la_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libacls_la_SOURCES) $(libauth_la_SOURCES) DIST_SOURCES = $(libacls_la_SOURCES) $(libauth_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -180,6 +487,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -218,6 +526,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -235,6 +544,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -272,11 +582,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -335,6 +647,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -438,7 +751,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -460,6 +773,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -472,16 +786,20 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libacls.la: $(libacls_la_OBJECTS) $(libacls_la_DEPENDENCIES) - $(CXXLINK) $(libacls_la_OBJECTS) $(libacls_la_LIBADD) $(LIBS) -libauth.la: $(libauth_la_OBJECTS) $(libauth_la_DEPENDENCIES) - $(CXXLINK) $(libauth_la_OBJECTS) $(libauth_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libacls.la: $(libacls_la_OBJECTS) $(libacls_la_DEPENDENCIES) $(EXTRA_libacls_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libacls_la_OBJECTS) $(libacls_la_LIBADD) $(LIBS) + +libauth.la: $(libauth_la_OBJECTS) $(libauth_la_DEPENDENCIES) $(EXTRA_libauth_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libauth_la_OBJECTS) $(libauth_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -511,25 +829,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UserRequest.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -538,22 +856,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -568,57 +889,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -634,12 +910,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -651,15 +922,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -668,101 +935,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -796,13 +1149,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -839,11 +1189,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -926,24 +1284,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/auth/negotiate/Makefile.in squid-3.4.4.1/src/auth/negotiate/Makefile.in --- squid-3.4.4/src/auth/negotiate/Makefile.in 2014-03-09 01:41:53.000000000 -0800 +++ squid-3.4.4.1/src/auth/negotiate/Makefile.in 2014-04-23 05:51:28.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/negotiate @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libnegotiate_la_OBJECTS = Scheme.lo auth_negotiate.lo User.lo \ UserRequest.lo libnegotiate_la_OBJECTS = $(am_libnegotiate_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libnegotiate_la_SOURCES) DIST_SOURCES = $(libnegotiate_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -374,7 +684,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -396,6 +706,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -408,14 +719,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libnegotiate.la: $(libnegotiate_la_OBJECTS) $(libnegotiate_la_DEPENDENCIES) - $(CXXLINK) $(libnegotiate_la_OBJECTS) $(libnegotiate_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libnegotiate.la: $(libnegotiate_la_OBJECTS) $(libnegotiate_la_DEPENDENCIES) $(EXTRA_libnegotiate_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libnegotiate_la_OBJECTS) $(libnegotiate_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -438,25 +752,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_negotiate.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -464,26 +778,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -495,15 +798,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -512,101 +811,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -654,11 +1039,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -743,19 +1136,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/auth/ntlm/Makefile.in squid-3.4.4.1/src/auth/ntlm/Makefile.in --- squid-3.4.4/src/auth/ntlm/Makefile.in 2014-03-09 01:41:54.000000000 -0800 +++ squid-3.4.4.1/src/auth/ntlm/Makefile.in 2014-04-23 05:51:28.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/ntlm @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,39 +152,298 @@ libntlm_la_LIBADD = am_libntlm_la_OBJECTS = Scheme.lo auth_ntlm.lo User.lo UserRequest.lo libntlm_la_OBJECTS = $(am_libntlm_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libntlm_la_SOURCES) DIST_SOURCES = $(libntlm_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +482,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +500,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +538,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +603,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -373,7 +683,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -395,6 +705,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -407,14 +718,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libntlm.la: $(libntlm_la_OBJECTS) $(libntlm_la_DEPENDENCIES) - $(CXXLINK) $(libntlm_la_OBJECTS) $(libntlm_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libntlm.la: $(libntlm_la_OBJECTS) $(libntlm_la_DEPENDENCIES) $(EXTRA_libntlm_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libntlm_la_OBJECTS) $(libntlm_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -437,25 +751,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_ntlm.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -463,26 +777,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +797,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,101 +810,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -653,11 +1038,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -742,19 +1135,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/base/Makefile.in squid-3.4.4.1/src/base/Makefile.in --- squid-3.4.4/src/base/Makefile.in 2014-03-09 01:41:54.000000000 -0800 +++ squid-3.4.4.1/src/base/Makefile.in 2014-04-23 05:51:29.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/base @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libbase_la_OBJECTS = AsyncCall.lo AsyncJob.lo AsyncCallQueue.lo \ RunnersRegistry.lo TextException.lo Vector.lo libbase_la_OBJECTS = $(am_libbase_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libbase_la_SOURCES) DIST_SOURCES = $(libbase_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -387,7 +697,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -409,6 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -421,14 +732,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libbase.la: $(libbase_la_OBJECTS) $(libbase_la_DEPENDENCIES) - $(CXXLINK) $(libbase_la_OBJECTS) $(libbase_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libbase.la: $(libbase_la_OBJECTS) $(libbase_la_DEPENDENCIES) $(EXTRA_libbase_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libbase_la_OBJECTS) $(libbase_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -453,25 +767,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vector.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -479,26 +793,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -510,15 +813,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -527,101 +826,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -669,11 +1054,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -758,19 +1151,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/cf.data.pre squid-3.4.4.1/src/cf.data.pre --- squid-3.4.4/src/cf.data.pre 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/cf.data.pre 2014-04-23 05:50:18.000000000 -0700 @@ -2035,10 +2035,19 @@ LOC: Ip::Qos::TheConfig DOC_START Allows you to select a TOS/DSCP value to mark outgoing - connections with, based on where the reply was sourced. For - platforms using netfilter, allows you to set a netfilter mark + connections to the client, based on where the reply was sourced. + For platforms using netfilter, allows you to set a netfilter mark value instead of, or in addition to, a TOS value. + By default this functionality is disabled. To enable it with the default + settings simply use "qos_flows mark" or "qos_flows tos". Default + settings will result in the netfilter mark or TOS value being copied + from the upstream connection to the client. Note that it is the connection + CONNMARK value not the packet MARK value that is copied. + + It is not currently possible to copy the mark or TOS value from the + client to the upstream connection request. + TOS values really only have local significance - so you should know what you're specifying. For more information, see RFC2474, RFC2475, and RFC3260. diff -u -r -N squid-3.4.4/src/client_side.cc squid-3.4.4.1/src/client_side.cc --- squid-3.4.4/src/client_side.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/client_side.cc 2014-04-23 05:50:18.000000000 -0700 @@ -2864,6 +2864,10 @@ if (http->request->method == Http::METHOD_CONNECT) { context->mayUseConnection(true); conn->flags.readMore = false; + + // consume header early so that tunnel gets just the body + connNoteUseOfBuffer(conn, http->req_sz); + notedUseOfBuffer = true; } #if USE_SSL @@ -2889,7 +2893,7 @@ assert (repContext); conn->quitAfterError(request.getRaw()); repContext->setReplyToError(ERR_TOO_BIG, - Http::scRequestEntityTooLarge, Http::METHOD_NONE, NULL, + Http::scPayloadTooLarge, Http::METHOD_NONE, NULL, conn->clientConnection->remote, http->request, NULL, NULL); assert(context->http->out.offset == 0); context->pullData(); @@ -3254,7 +3258,7 @@ clientReplyContext *repContext = dynamic_cast(node->data.getRaw()); assert(repContext); const Http::StatusCode scode = (error == ERR_TOO_BIG) ? - Http::scRequestEntityTooLarge : HTTP_BAD_REQUEST; + Http::scPayloadTooLarge : HTTP_BAD_REQUEST; repContext->setReplyToError(error, scode, repContext->http->request->method, repContext->http->uri, diff -u -r -N squid-3.4.4/src/client_side_reply.cc squid-3.4.4.1/src/client_side_reply.cc --- squid-3.4.4/src/client_side_reply.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/client_side_reply.cc 2014-04-23 05:50:18.000000000 -0700 @@ -700,8 +700,8 @@ { debugs(88, 4, "clientProcessOnlyIfCachedMiss: '" << RequestMethodStr(http->request->method) << " " << http->uri << "'"); - http->al->http.code = Http::scGateway_Timeout; - ErrorState *err = clientBuildError(ERR_ONLY_IF_CACHED_MISS, Http::scGateway_Timeout, NULL, + http->al->http.code = Http::scGatewayTimeout; + ErrorState *err = clientBuildError(ERR_ONLY_IF_CACHED_MISS, Http::scGatewayTimeout, NULL, http->getConn()->clientConnection->remote, http->request); removeClientStoreReference(&sc, http); startError(err); diff -u -r -N squid-3.4.4/src/client_side_request.cc squid-3.4.4.1/src/client_side_request.cc --- squid-3.4.4/src/client_side_request.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/client_side_request.cc 2014-04-23 05:50:18.000000000 -0700 @@ -1273,17 +1273,17 @@ // TODO: change default redirect status for appropriate requests // Squid defaults to 302 status for now for better compatibility with old clients. - // HTTP/1.0 client should get 302 (Http::scMovedTemporarily) + // HTTP/1.0 client should get 302 (Http::scFound) // HTTP/1.1 client contacting reverse-proxy should get 307 (Http::scTemporaryRedirect) // HTTP/1.1 client being diverted by forward-proxy should get 303 (Http::scSeeOther) - Http::StatusCode status = Http::scMovedTemporarily; + Http::StatusCode status = Http::scFound; if (statusNote != NULL) { const char * result = statusNote; status = static_cast(atoi(result)); } if (status == Http::scMovedPermanently - || status == Http::scMovedTemporarily + || status == Http::scFound || status == Http::scSeeOther || status == Http::scPermanentRedirect || status == Http::scTemporaryRedirect) { diff -u -r -N squid-3.4.4/src/comm/Makefile.in squid-3.4.4.1/src/comm/Makefile.in --- squid-3.4.4/src/comm/Makefile.in 2014-03-09 01:41:54.000000000 -0800 +++ squid-3.4.4.1/src/comm/Makefile.in 2014-04-23 05:51:29.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/comm @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -109,39 +155,298 @@ ModPoll.lo ModSelect.lo ModSelectWin32.lo TcpAcceptor.lo \ Write.lo libcomm_la_OBJECTS = $(am_libcomm_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libcomm_la_SOURCES) DIST_SOURCES = $(libcomm_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -180,6 +485,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -197,6 +503,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -234,11 +541,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -297,6 +606,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -391,7 +701,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -413,6 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -425,14 +736,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libcomm.la: $(libcomm_la_OBJECTS) $(libcomm_la_DEPENDENCIES) - $(CXXLINK) $(libcomm_la_OBJECTS) $(libcomm_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libcomm.la: $(libcomm_la_OBJECTS) $(libcomm_la_DEPENDENCIES) $(EXTRA_libcomm_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libcomm_la_OBJECTS) $(libcomm_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -463,25 +777,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Write.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -489,26 +803,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -520,15 +823,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -537,101 +836,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -679,11 +1064,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -768,19 +1161,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/comm/TcpAcceptor.cc squid-3.4.4.1/src/comm/TcpAcceptor.cc --- squid-3.4.4/src/comm/TcpAcceptor.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/comm/TcpAcceptor.cc 2014-04-23 05:50:18.000000000 -0700 @@ -388,10 +388,10 @@ #if USE_SQUID_EUI if (Eui::TheConfig.euiLookup) { - if (conn->remote.isIPv4()) { - conn->remoteEui48.lookup(conn->remote); - } else if (conn->remote.isIPv6()) { - conn->remoteEui64.lookup(conn->remote); + if (details->remote.isIPv4()) { + details->remoteEui48.lookup(details->remote); + } else if (details->remote.isIPv6()) { + details->remoteEui64.lookup(details->remote); } } #endif diff -u -r -N squid-3.4.4/src/dns_internal.cc squid-3.4.4.1/src/dns_internal.cc --- squid-3.4.4/src/dns_internal.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/dns_internal.cc 2014-04-23 05:50:18.000000000 -0700 @@ -37,6 +37,7 @@ #include "comm.h" #include "comm/Loops.h" #include "comm/Write.h" +#include "dlink.h" #include "event.h" #include "fd.h" #include "fde.h" diff -u -r -N squid-3.4.4/src/errorpage.cc squid-3.4.4.1/src/errorpage.cc --- squid-3.4.4/src/errorpage.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/errorpage.cc 2014-04-23 05:50:18.000000000 -0700 @@ -1157,7 +1157,7 @@ if (name[0] == '3' || (name[0] != '2' && name[0] != '4' && name[0] != '5' && strchr(name, ':'))) { /* Redirection */ - Http::StatusCode status = Http::scMovedTemporarily; + Http::StatusCode status = Http::scFound; // Use configured 3xx reply status if set. if (name[0] == '3') status = httpStatus; @@ -1304,6 +1304,8 @@ if (*m) content->Printf("%s", m); /* copy tail */ + content->terminate(); + assert((size_t)content->contentSize() == strlen(content->content())); return content; diff -u -r -N squid-3.4.4/src/esi/Makefile.in squid-3.4.4.1/src/esi/Makefile.in --- squid-3.4.4/src/esi/Makefile.in 2014-03-09 01:41:54.000000000 -0800 +++ squid-3.4.4.1/src/esi/Makefile.in 2014-04-23 05:51:30.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @HAVE_LIBEXPAT_TRUE@am__append_2 = \ @@ -55,7 +101,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -126,39 +172,298 @@ Expression.lo Include.lo Module.lo Parser.lo Segment.lo \ Sequence.lo VarState.lo libesi_la_OBJECTS = $(am_libesi_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libesi_la_SOURCES) DIST_SOURCES = $(am__libesi_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -197,6 +502,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -214,6 +520,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -251,11 +558,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -314,6 +623,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -414,7 +724,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -436,6 +746,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -448,14 +759,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libesi.la: $(libesi_la_OBJECTS) $(libesi_la_DEPENDENCIES) - $(CXXLINK) $(libesi_la_OBJECTS) $(libesi_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libesi.la: $(libesi_la_OBJECTS) $(libesi_la_DEPENDENCIES) $(EXTRA_libesi_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libesi_la_OBJECTS) $(libesi_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -487,25 +801,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VarState.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -513,26 +827,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -544,15 +847,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -561,101 +860,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -703,11 +1088,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -792,19 +1185,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/eui/Eui48.cc squid-3.4.4.1/src/eui/Eui48.cc --- squid-3.4.4/src/eui/Eui48.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/eui/Eui48.cc 2014-04-23 05:50:18.000000000 -0700 @@ -135,18 +135,23 @@ eui[3] = (u_char) a4; eui[4] = (u_char) a5; eui[5] = (u_char) a6; + + debugs(28, 4, "id=" << (void*)this << " decoded " << asc); return true; } bool Eui::Eui48::encode(char *buf, const int len) { - if (len < SZ_EUI48_BUF) return false; + if (len < SZ_EUI48_BUF) + return false; snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x", eui[0] & 0xff, eui[1] & 0xff, eui[2] & 0xff, eui[3] & 0xff, eui[4] & 0xff, eui[5] & 0xff); + + debugs(28, 4, "id=" << (void*)this << " encoded " << buf); return true; } @@ -154,9 +159,6 @@ bool Eui::Eui48::lookup(const Ip::Address &c) { -#if !_SQUID_WINDOWS_ -#endif /* !_SQUID_WINDOWS_ */ - Ip::Address ipAddr = c; ipAddr.port(0); @@ -198,6 +200,7 @@ ipAddr.getSockAddr(*sa); /* Query ARP table */ + debugs(28, 4, "id=" << (void*)this << " query ARP table"); if (ioctl(tmpSocket, SIOCGARP, &arpReq) != -1) { /* Skip non-ethernet interfaces */ close(tmpSocket); @@ -207,7 +210,7 @@ return false; } - debugs(28, 4, "Got address "<< std::setfill('0') << std::hex << + debugs(28, 4, "id=" << (void*)this << " got address "<< std::setfill('0') << std::hex << std::setw(2) << (arpReq.arp_ha.sa_data[0] & 0xff) << ":" << std::setw(2) << (arpReq.arp_ha.sa_data[1] & 0xff) << ":" << std::setw(2) << (arpReq.arp_ha.sa_data[2] & 0xff) << ":" << @@ -240,20 +243,22 @@ /* Attempt ARP lookup on each interface */ offset = 0; - + debugs(28, 4, "id=" << (void*)this << " query ARP on each interface (" << ifc.ifc_len << " found)"); while (offset < ifc.ifc_len) { ifr = (struct ifreq *) (ifbuffer + offset); offset += sizeof(*ifr); - /* Skip loopback and aliased interfaces */ - if (0 == strncmp(ifr->ifr_name, "lo", 2)) + debugs(28, 4, "id=" << (void*)this << " found interface " << ifr->ifr_name); + + /* Skip loopback and aliased interfaces */ + if (!strncmp(ifr->ifr_name, "lo", 2)) continue; - if (NULL != strchr(ifr->ifr_name, ':')) + if (strchr(ifr->ifr_name, ':')) continue; - debugs(28, 4, "Looking up ARP address for " << ipAddr << " on " << ifr->ifr_name); + debugs(28, 4, "id=" << (void*)this << " looking up ARP address for " << ipAddr << " on " << ifr->ifr_name); /* Set up structures for ARP lookup */ @@ -284,10 +289,12 @@ } /* Skip non-ethernet interfaces */ - if (arpReq.arp_ha.sa_family != ARPHRD_ETHER) + if (arpReq.arp_ha.sa_family != ARPHRD_ETHER) { + debugs(28, 4, "id=" << (void*)this << "... not an Ethernet interface"); continue; + } - debugs(28, 4, "Got address "<< std::setfill('0') << std::hex << + debugs(28, 4, "id=" << (void*)this << " got address "<< std::setfill('0') << std::hex << std::setw(2) << (arpReq.arp_ha.sa_data[0] & 0xff) << ":" << std::setw(2) << (arpReq.arp_ha.sa_data[1] & 0xff) << ":" << std::setw(2) << (arpReq.arp_ha.sa_data[2] & 0xff) << ":" << @@ -354,6 +361,8 @@ set(arpReq.arp_ha.sa_data, 6); return true; + } else { + close(tmpSocket); } #elif _SQUID_FREEBSD_ || _SQUID_NETBSD_ || _SQUID_OPENBSD_ || _SQUID_DRAGONFLY_ || _SQUID_KFREEBSD_ @@ -528,7 +537,7 @@ /* * Address was not found on any interface */ - debugs(28, 3, HERE << ipAddr << " NOT found"); + debugs(28, 3, "id=" << (void*)this << ' ' << ipAddr << " NOT found"); clear(); return false; diff -u -r -N squid-3.4.4/src/eui/Eui48.h squid-3.4.4.1/src/eui/Eui48.h --- squid-3.4.4/src/eui/Eui48.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/eui/Eui48.h 2014-04-23 05:50:18.000000000 -0700 @@ -27,9 +27,9 @@ { public: - Eui48() { clear(); }; - Eui48(const Eui48 &t) { memcpy(this, &t, sizeof(Eui48)); }; - ~Eui48() {}; + Eui48() { clear(); } + Eui48(const Eui48 &t) { memcpy(this, &t, sizeof(Eui48)); } + ~Eui48() {} const unsigned char *get(void); @@ -38,9 +38,9 @@ if (len < SZ_EUI48_BUF) clear(); memcpy(eui, src, len); return true; - }; + } - void clear() { memset(eui, 0, SZ_EUI48_BUF); }; + void clear() { memset(eui, 0, SZ_EUI48_BUF); } /** * Decode an ascii representation of an EUI-48 ethernet address. diff -u -r -N squid-3.4.4/src/eui/Eui64.cc squid-3.4.4.1/src/eui/Eui64.cc --- squid-3.4.4/src/eui/Eui64.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/eui/Eui64.cc 2014-04-23 05:50:18.000000000 -0700 @@ -18,8 +18,12 @@ bool Eui::Eui64::decode(const char *asc) { - if (eui64_aton(asc, (struct eui64 *)eui) != 0) return false; + if (eui64_aton(asc, (struct eui64 *)eui) != 0) { + debugs(28, 4, "id=" << (void*)this << " decode fail on " << asc); + return false; + } + debugs(28, 4, "id=" << (void*)this << " ATON decoded " << asc); return true; } @@ -31,6 +35,7 @@ snprintf(buf, len, "%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x", eui[0], eui[1], eui[2], eui[3], eui[4], eui[5], eui[6], eui[7]); + debugs(28, 4, "id=" << (void*)this << " encoded " << buf); return true; } @@ -39,7 +44,8 @@ Eui::Eui64::lookup(const Ip::Address &c) { /* try to short-circuit slow OS lookups by using SLAAC data */ - if (lookupSlaac(c)) return true; + if (lookupSlaac(c)) + return true; // find EUI-64 some other way. NDP table lookup? return lookupNdp(c); @@ -49,15 +55,18 @@ Eui::Eui64::lookupSlaac(const Ip::Address &c) { /* RFC 4291 Link-Local unicast addresses which contain SLAAC - usually trustable. */ - if (c.isSiteLocal6() && c.isSiteLocalAuto() ) { + if (c.isSiteLocal6() && c.isSiteLocalAuto()) { // strip the final 64 bits of the address... struct in6_addr tmp; c.getInAddr(tmp); memcpy(eui, &(tmp.s6_addr[8]), SZ_EUI64_BUF); - + debugs(28, 4, "id=" << (void*)this << " SLAAC decoded " << c); return true; } + + debugs(28, 4, "id=" << (void*)this << " SLAAC fail on " << c << " SL-6=" + << (c.isSiteLocal6()?'T':'F') << " AAC-6=" << (c.isSiteLocalAuto()?'T':'F')); return false; } @@ -73,7 +82,7 @@ /* * Address was not found on any interface */ - debugs(28, 3, HERE << c << " NOT found"); + debugs(28, 3, "id=" << (void*)this << ' ' << c << " NOT found"); #endif /* 0 */ clear(); diff -u -r -N squid-3.4.4/src/eui/Eui64.h squid-3.4.4.1/src/eui/Eui64.h --- squid-3.4.4/src/eui/Eui64.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/eui/Eui64.h 2014-04-23 05:50:18.000000000 -0700 @@ -34,9 +34,9 @@ { public: - Eui64() { clear(); }; - Eui64(const Eui64 &t) { memcpy(this, &t, sizeof(Eui64)); }; - ~Eui64() {}; + Eui64() { clear(); } + Eui64(const Eui64 &t) { memcpy(this, &t, sizeof(Eui64)); } + ~Eui64() {} const unsigned char *get(void); @@ -45,9 +45,9 @@ if (len < SZ_EUI64_BUF) clear(); memcpy(eui, src, len); return true; - }; + } - void clear() { memset(eui, 0, SZ_EUI64_BUF); }; + void clear() { memset(eui, 0, SZ_EUI64_BUF); } /** * Decode an ascii representation of an EUI-64 address. diff -u -r -N squid-3.4.4/src/eui/Makefile.in squid-3.4.4.1/src/eui/Makefile.in --- squid-3.4.4/src/eui/Makefile.in 2014-03-09 01:41:54.000000000 -0800 +++ squid-3.4.4.1/src/eui/Makefile.in 2014-04-23 05:51:30.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/eui @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ libeui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libeui_la_OBJECTS = Config.lo Eui48.lo Eui64.lo libeui_la_OBJECTS = $(am_libeui_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libeui_la_SOURCES) DIST_SOURCES = $(libeui_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -373,7 +683,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -395,6 +705,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -407,14 +718,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libeui.la: $(libeui_la_OBJECTS) $(libeui_la_DEPENDENCIES) - $(CXXLINK) $(libeui_la_OBJECTS) $(libeui_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libeui.la: $(libeui_la_OBJECTS) $(libeui_la_DEPENDENCIES) $(EXTRA_libeui_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libeui_la_OBJECTS) $(libeui_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -436,25 +750,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Eui64.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -462,26 +776,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -493,15 +796,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -510,101 +809,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -652,11 +1037,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -741,19 +1134,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/format/Makefile.in squid-3.4.4.1/src/format/Makefile.in --- squid-3.4.4/src/format/Makefile.in 2014-03-09 01:41:55.000000000 -0800 +++ squid-3.4.4.1/src/format/Makefile.in 2014-04-23 05:51:31.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/format @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,39 +152,298 @@ libformat_la_LIBADD = am_libformat_la_OBJECTS = Config.lo Format.lo Quoting.lo Token.lo libformat_la_OBJECTS = $(am_libformat_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libformat_la_SOURCES) DIST_SOURCES = $(libformat_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +482,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +500,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +538,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +603,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -375,7 +685,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -397,6 +707,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -409,14 +720,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libformat.la: $(libformat_la_OBJECTS) $(libformat_la_DEPENDENCIES) - $(CXXLINK) $(libformat_la_OBJECTS) $(libformat_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libformat.la: $(libformat_la_OBJECTS) $(libformat_la_DEPENDENCIES) $(EXTRA_libformat_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libformat_la_OBJECTS) $(libformat_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -439,25 +753,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Token.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -465,26 +779,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -496,15 +799,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -513,101 +812,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -655,11 +1040,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -744,19 +1137,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/fs/Makefile.in squid-3.4.4.1/src/fs/Makefile.in --- squid-3.4.4/src/fs/Makefile.in 2014-03-09 01:41:55.000000000 -0800 +++ squid-3.4.4.1/src/fs/Makefile.in 2014-04-23 05:51:32.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/fs @@ -47,7 +92,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,6 +151,10 @@ libaufs_la_LIBADD = am_libaufs_la_OBJECTS = StoreFSaufs.lo libaufs_la_OBJECTS = $(am_libaufs_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libcoss_la_LIBADD = am_libcoss_la_OBJECTS = StoreFScoss.lo store_io_coss.lo \ store_dir_coss.lo @@ -125,43 +174,298 @@ UFSStrategy.lo StoreSearchUFS.lo UFSSwapLogParser.lo \ RebuildState.lo libufs_la_OBJECTS = $(am_libufs_la_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libaufs_la_SOURCES) $(libcoss_la_SOURCES) \ $(libdiskd_la_SOURCES) $(libfs_la_SOURCES) \ $(librock_la_SOURCES) $(libufs_la_SOURCES) DIST_SOURCES = $(libaufs_la_SOURCES) $(libcoss_la_SOURCES) \ $(libdiskd_la_SOURCES) $(libfs_la_SOURCES) \ $(librock_la_SOURCES) $(libufs_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -200,6 +504,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -217,6 +522,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -254,11 +560,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -317,6 +625,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -440,7 +749,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -462,6 +771,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -474,24 +784,32 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libaufs.la: $(libaufs_la_OBJECTS) $(libaufs_la_DEPENDENCIES) - $(CXXLINK) $(libaufs_la_OBJECTS) $(libaufs_la_LIBADD) $(LIBS) -libcoss.la: $(libcoss_la_OBJECTS) $(libcoss_la_DEPENDENCIES) - $(CXXLINK) $(libcoss_la_OBJECTS) $(libcoss_la_LIBADD) $(LIBS) -libdiskd.la: $(libdiskd_la_OBJECTS) $(libdiskd_la_DEPENDENCIES) - $(CXXLINK) $(libdiskd_la_OBJECTS) $(libdiskd_la_LIBADD) $(LIBS) -libfs.la: $(libfs_la_OBJECTS) $(libfs_la_DEPENDENCIES) - $(CXXLINK) $(libfs_la_OBJECTS) $(libfs_la_LIBADD) $(LIBS) -librock.la: $(librock_la_OBJECTS) $(librock_la_DEPENDENCIES) - $(CXXLINK) $(librock_la_OBJECTS) $(librock_la_LIBADD) $(LIBS) -libufs.la: $(libufs_la_OBJECTS) $(libufs_la_DEPENDENCIES) - $(CXXLINK) $(libufs_la_OBJECTS) $(libufs_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libaufs.la: $(libaufs_la_OBJECTS) $(libaufs_la_DEPENDENCIES) $(EXTRA_libaufs_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libaufs_la_OBJECTS) $(libaufs_la_LIBADD) $(LIBS) + +libcoss.la: $(libcoss_la_OBJECTS) $(libcoss_la_DEPENDENCIES) $(EXTRA_libcoss_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libcoss_la_OBJECTS) $(libcoss_la_LIBADD) $(LIBS) + +libdiskd.la: $(libdiskd_la_OBJECTS) $(libdiskd_la_DEPENDENCIES) $(EXTRA_libdiskd_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libdiskd_la_OBJECTS) $(libdiskd_la_LIBADD) $(LIBS) + +libfs.la: $(libfs_la_OBJECTS) $(libfs_la_DEPENDENCIES) $(EXTRA_libfs_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libfs_la_OBJECTS) $(libfs_la_LIBADD) $(LIBS) + +librock.la: $(librock_la_OBJECTS) $(librock_la_DEPENDENCIES) $(EXTRA_librock_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(librock_la_OBJECTS) $(librock_la_LIBADD) $(LIBS) + +libufs.la: $(libufs_la_OBJECTS) $(libufs_la_DEPENDENCIES) $(EXTRA_libufs_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libufs_la_OBJECTS) $(libufs_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -528,144 +846,144 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_io_coss.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< StoreFSaufs.lo: aufs/StoreFSaufs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSaufs.lo -MD -MP -MF $(DEPDIR)/StoreFSaufs.Tpo -c -o StoreFSaufs.lo `test -f 'aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`aufs/StoreFSaufs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StoreFSaufs.Tpo $(DEPDIR)/StoreFSaufs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='aufs/StoreFSaufs.cc' object='StoreFSaufs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSaufs.lo -MD -MP -MF $(DEPDIR)/StoreFSaufs.Tpo -c -o StoreFSaufs.lo `test -f 'aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`aufs/StoreFSaufs.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/StoreFSaufs.Tpo $(DEPDIR)/StoreFSaufs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='aufs/StoreFSaufs.cc' object='StoreFSaufs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSaufs.lo `test -f 'aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`aufs/StoreFSaufs.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSaufs.lo `test -f 'aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`aufs/StoreFSaufs.cc StoreFScoss.lo: coss/StoreFScoss.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFScoss.lo -MD -MP -MF $(DEPDIR)/StoreFScoss.Tpo -c -o StoreFScoss.lo `test -f 'coss/StoreFScoss.cc' || echo '$(srcdir)/'`coss/StoreFScoss.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StoreFScoss.Tpo $(DEPDIR)/StoreFScoss.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='coss/StoreFScoss.cc' object='StoreFScoss.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFScoss.lo -MD -MP -MF $(DEPDIR)/StoreFScoss.Tpo -c -o StoreFScoss.lo `test -f 'coss/StoreFScoss.cc' || echo '$(srcdir)/'`coss/StoreFScoss.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/StoreFScoss.Tpo $(DEPDIR)/StoreFScoss.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coss/StoreFScoss.cc' object='StoreFScoss.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFScoss.lo `test -f 'coss/StoreFScoss.cc' || echo '$(srcdir)/'`coss/StoreFScoss.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFScoss.lo `test -f 'coss/StoreFScoss.cc' || echo '$(srcdir)/'`coss/StoreFScoss.cc store_io_coss.lo: coss/store_io_coss.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT store_io_coss.lo -MD -MP -MF $(DEPDIR)/store_io_coss.Tpo -c -o store_io_coss.lo `test -f 'coss/store_io_coss.cc' || echo '$(srcdir)/'`coss/store_io_coss.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/store_io_coss.Tpo $(DEPDIR)/store_io_coss.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='coss/store_io_coss.cc' object='store_io_coss.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT store_io_coss.lo -MD -MP -MF $(DEPDIR)/store_io_coss.Tpo -c -o store_io_coss.lo `test -f 'coss/store_io_coss.cc' || echo '$(srcdir)/'`coss/store_io_coss.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/store_io_coss.Tpo $(DEPDIR)/store_io_coss.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coss/store_io_coss.cc' object='store_io_coss.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o store_io_coss.lo `test -f 'coss/store_io_coss.cc' || echo '$(srcdir)/'`coss/store_io_coss.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o store_io_coss.lo `test -f 'coss/store_io_coss.cc' || echo '$(srcdir)/'`coss/store_io_coss.cc store_dir_coss.lo: coss/store_dir_coss.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT store_dir_coss.lo -MD -MP -MF $(DEPDIR)/store_dir_coss.Tpo -c -o store_dir_coss.lo `test -f 'coss/store_dir_coss.cc' || echo '$(srcdir)/'`coss/store_dir_coss.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/store_dir_coss.Tpo $(DEPDIR)/store_dir_coss.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='coss/store_dir_coss.cc' object='store_dir_coss.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT store_dir_coss.lo -MD -MP -MF $(DEPDIR)/store_dir_coss.Tpo -c -o store_dir_coss.lo `test -f 'coss/store_dir_coss.cc' || echo '$(srcdir)/'`coss/store_dir_coss.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/store_dir_coss.Tpo $(DEPDIR)/store_dir_coss.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='coss/store_dir_coss.cc' object='store_dir_coss.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o store_dir_coss.lo `test -f 'coss/store_dir_coss.cc' || echo '$(srcdir)/'`coss/store_dir_coss.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o store_dir_coss.lo `test -f 'coss/store_dir_coss.cc' || echo '$(srcdir)/'`coss/store_dir_coss.cc StoreFSdiskd.lo: diskd/StoreFSdiskd.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSdiskd.lo -MD -MP -MF $(DEPDIR)/StoreFSdiskd.Tpo -c -o StoreFSdiskd.lo `test -f 'diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`diskd/StoreFSdiskd.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StoreFSdiskd.Tpo $(DEPDIR)/StoreFSdiskd.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='diskd/StoreFSdiskd.cc' object='StoreFSdiskd.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSdiskd.lo -MD -MP -MF $(DEPDIR)/StoreFSdiskd.Tpo -c -o StoreFSdiskd.lo `test -f 'diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`diskd/StoreFSdiskd.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/StoreFSdiskd.Tpo $(DEPDIR)/StoreFSdiskd.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='diskd/StoreFSdiskd.cc' object='StoreFSdiskd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSdiskd.lo `test -f 'diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`diskd/StoreFSdiskd.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSdiskd.lo `test -f 'diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`diskd/StoreFSdiskd.cc RockIoState.lo: rock/RockIoState.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockIoState.lo -MD -MP -MF $(DEPDIR)/RockIoState.Tpo -c -o RockIoState.lo `test -f 'rock/RockIoState.cc' || echo '$(srcdir)/'`rock/RockIoState.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RockIoState.Tpo $(DEPDIR)/RockIoState.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rock/RockIoState.cc' object='RockIoState.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockIoState.lo -MD -MP -MF $(DEPDIR)/RockIoState.Tpo -c -o RockIoState.lo `test -f 'rock/RockIoState.cc' || echo '$(srcdir)/'`rock/RockIoState.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RockIoState.Tpo $(DEPDIR)/RockIoState.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rock/RockIoState.cc' object='RockIoState.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockIoState.lo `test -f 'rock/RockIoState.cc' || echo '$(srcdir)/'`rock/RockIoState.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockIoState.lo `test -f 'rock/RockIoState.cc' || echo '$(srcdir)/'`rock/RockIoState.cc RockIoRequests.lo: rock/RockIoRequests.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockIoRequests.lo -MD -MP -MF $(DEPDIR)/RockIoRequests.Tpo -c -o RockIoRequests.lo `test -f 'rock/RockIoRequests.cc' || echo '$(srcdir)/'`rock/RockIoRequests.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RockIoRequests.Tpo $(DEPDIR)/RockIoRequests.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rock/RockIoRequests.cc' object='RockIoRequests.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockIoRequests.lo -MD -MP -MF $(DEPDIR)/RockIoRequests.Tpo -c -o RockIoRequests.lo `test -f 'rock/RockIoRequests.cc' || echo '$(srcdir)/'`rock/RockIoRequests.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RockIoRequests.Tpo $(DEPDIR)/RockIoRequests.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rock/RockIoRequests.cc' object='RockIoRequests.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockIoRequests.lo `test -f 'rock/RockIoRequests.cc' || echo '$(srcdir)/'`rock/RockIoRequests.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockIoRequests.lo `test -f 'rock/RockIoRequests.cc' || echo '$(srcdir)/'`rock/RockIoRequests.cc RockRebuild.lo: rock/RockRebuild.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockRebuild.lo -MD -MP -MF $(DEPDIR)/RockRebuild.Tpo -c -o RockRebuild.lo `test -f 'rock/RockRebuild.cc' || echo '$(srcdir)/'`rock/RockRebuild.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RockRebuild.Tpo $(DEPDIR)/RockRebuild.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rock/RockRebuild.cc' object='RockRebuild.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockRebuild.lo -MD -MP -MF $(DEPDIR)/RockRebuild.Tpo -c -o RockRebuild.lo `test -f 'rock/RockRebuild.cc' || echo '$(srcdir)/'`rock/RockRebuild.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RockRebuild.Tpo $(DEPDIR)/RockRebuild.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rock/RockRebuild.cc' object='RockRebuild.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockRebuild.lo `test -f 'rock/RockRebuild.cc' || echo '$(srcdir)/'`rock/RockRebuild.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockRebuild.lo `test -f 'rock/RockRebuild.cc' || echo '$(srcdir)/'`rock/RockRebuild.cc RockStoreFileSystem.lo: rock/RockStoreFileSystem.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockStoreFileSystem.lo -MD -MP -MF $(DEPDIR)/RockStoreFileSystem.Tpo -c -o RockStoreFileSystem.lo `test -f 'rock/RockStoreFileSystem.cc' || echo '$(srcdir)/'`rock/RockStoreFileSystem.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RockStoreFileSystem.Tpo $(DEPDIR)/RockStoreFileSystem.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rock/RockStoreFileSystem.cc' object='RockStoreFileSystem.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockStoreFileSystem.lo -MD -MP -MF $(DEPDIR)/RockStoreFileSystem.Tpo -c -o RockStoreFileSystem.lo `test -f 'rock/RockStoreFileSystem.cc' || echo '$(srcdir)/'`rock/RockStoreFileSystem.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RockStoreFileSystem.Tpo $(DEPDIR)/RockStoreFileSystem.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rock/RockStoreFileSystem.cc' object='RockStoreFileSystem.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockStoreFileSystem.lo `test -f 'rock/RockStoreFileSystem.cc' || echo '$(srcdir)/'`rock/RockStoreFileSystem.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockStoreFileSystem.lo `test -f 'rock/RockStoreFileSystem.cc' || echo '$(srcdir)/'`rock/RockStoreFileSystem.cc RockSwapDir.lo: rock/RockSwapDir.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockSwapDir.lo -MD -MP -MF $(DEPDIR)/RockSwapDir.Tpo -c -o RockSwapDir.lo `test -f 'rock/RockSwapDir.cc' || echo '$(srcdir)/'`rock/RockSwapDir.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RockSwapDir.Tpo $(DEPDIR)/RockSwapDir.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rock/RockSwapDir.cc' object='RockSwapDir.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RockSwapDir.lo -MD -MP -MF $(DEPDIR)/RockSwapDir.Tpo -c -o RockSwapDir.lo `test -f 'rock/RockSwapDir.cc' || echo '$(srcdir)/'`rock/RockSwapDir.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RockSwapDir.Tpo $(DEPDIR)/RockSwapDir.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='rock/RockSwapDir.cc' object='RockSwapDir.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockSwapDir.lo `test -f 'rock/RockSwapDir.cc' || echo '$(srcdir)/'`rock/RockSwapDir.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RockSwapDir.lo `test -f 'rock/RockSwapDir.cc' || echo '$(srcdir)/'`rock/RockSwapDir.cc StoreFSufs.lo: ufs/StoreFSufs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSufs.lo -MD -MP -MF $(DEPDIR)/StoreFSufs.Tpo -c -o StoreFSufs.lo `test -f 'ufs/StoreFSufs.cc' || echo '$(srcdir)/'`ufs/StoreFSufs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StoreFSufs.Tpo $(DEPDIR)/StoreFSufs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/StoreFSufs.cc' object='StoreFSufs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreFSufs.lo -MD -MP -MF $(DEPDIR)/StoreFSufs.Tpo -c -o StoreFSufs.lo `test -f 'ufs/StoreFSufs.cc' || echo '$(srcdir)/'`ufs/StoreFSufs.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/StoreFSufs.Tpo $(DEPDIR)/StoreFSufs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/StoreFSufs.cc' object='StoreFSufs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSufs.lo `test -f 'ufs/StoreFSufs.cc' || echo '$(srcdir)/'`ufs/StoreFSufs.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreFSufs.lo `test -f 'ufs/StoreFSufs.cc' || echo '$(srcdir)/'`ufs/StoreFSufs.cc UFSStoreState.lo: ufs/UFSStoreState.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSStoreState.lo -MD -MP -MF $(DEPDIR)/UFSStoreState.Tpo -c -o UFSStoreState.lo `test -f 'ufs/UFSStoreState.cc' || echo '$(srcdir)/'`ufs/UFSStoreState.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/UFSStoreState.Tpo $(DEPDIR)/UFSStoreState.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/UFSStoreState.cc' object='UFSStoreState.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSStoreState.lo -MD -MP -MF $(DEPDIR)/UFSStoreState.Tpo -c -o UFSStoreState.lo `test -f 'ufs/UFSStoreState.cc' || echo '$(srcdir)/'`ufs/UFSStoreState.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/UFSStoreState.Tpo $(DEPDIR)/UFSStoreState.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/UFSStoreState.cc' object='UFSStoreState.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSStoreState.lo `test -f 'ufs/UFSStoreState.cc' || echo '$(srcdir)/'`ufs/UFSStoreState.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSStoreState.lo `test -f 'ufs/UFSStoreState.cc' || echo '$(srcdir)/'`ufs/UFSStoreState.cc UFSSwapDir.lo: ufs/UFSSwapDir.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSSwapDir.lo -MD -MP -MF $(DEPDIR)/UFSSwapDir.Tpo -c -o UFSSwapDir.lo `test -f 'ufs/UFSSwapDir.cc' || echo '$(srcdir)/'`ufs/UFSSwapDir.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/UFSSwapDir.Tpo $(DEPDIR)/UFSSwapDir.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/UFSSwapDir.cc' object='UFSSwapDir.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSSwapDir.lo -MD -MP -MF $(DEPDIR)/UFSSwapDir.Tpo -c -o UFSSwapDir.lo `test -f 'ufs/UFSSwapDir.cc' || echo '$(srcdir)/'`ufs/UFSSwapDir.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/UFSSwapDir.Tpo $(DEPDIR)/UFSSwapDir.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/UFSSwapDir.cc' object='UFSSwapDir.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSSwapDir.lo `test -f 'ufs/UFSSwapDir.cc' || echo '$(srcdir)/'`ufs/UFSSwapDir.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSSwapDir.lo `test -f 'ufs/UFSSwapDir.cc' || echo '$(srcdir)/'`ufs/UFSSwapDir.cc UFSStrategy.lo: ufs/UFSStrategy.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSStrategy.lo -MD -MP -MF $(DEPDIR)/UFSStrategy.Tpo -c -o UFSStrategy.lo `test -f 'ufs/UFSStrategy.cc' || echo '$(srcdir)/'`ufs/UFSStrategy.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/UFSStrategy.Tpo $(DEPDIR)/UFSStrategy.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/UFSStrategy.cc' object='UFSStrategy.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSStrategy.lo -MD -MP -MF $(DEPDIR)/UFSStrategy.Tpo -c -o UFSStrategy.lo `test -f 'ufs/UFSStrategy.cc' || echo '$(srcdir)/'`ufs/UFSStrategy.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/UFSStrategy.Tpo $(DEPDIR)/UFSStrategy.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/UFSStrategy.cc' object='UFSStrategy.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSStrategy.lo `test -f 'ufs/UFSStrategy.cc' || echo '$(srcdir)/'`ufs/UFSStrategy.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSStrategy.lo `test -f 'ufs/UFSStrategy.cc' || echo '$(srcdir)/'`ufs/UFSStrategy.cc StoreSearchUFS.lo: ufs/StoreSearchUFS.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreSearchUFS.lo -MD -MP -MF $(DEPDIR)/StoreSearchUFS.Tpo -c -o StoreSearchUFS.lo `test -f 'ufs/StoreSearchUFS.cc' || echo '$(srcdir)/'`ufs/StoreSearchUFS.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StoreSearchUFS.Tpo $(DEPDIR)/StoreSearchUFS.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/StoreSearchUFS.cc' object='StoreSearchUFS.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StoreSearchUFS.lo -MD -MP -MF $(DEPDIR)/StoreSearchUFS.Tpo -c -o StoreSearchUFS.lo `test -f 'ufs/StoreSearchUFS.cc' || echo '$(srcdir)/'`ufs/StoreSearchUFS.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/StoreSearchUFS.Tpo $(DEPDIR)/StoreSearchUFS.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/StoreSearchUFS.cc' object='StoreSearchUFS.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreSearchUFS.lo `test -f 'ufs/StoreSearchUFS.cc' || echo '$(srcdir)/'`ufs/StoreSearchUFS.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StoreSearchUFS.lo `test -f 'ufs/StoreSearchUFS.cc' || echo '$(srcdir)/'`ufs/StoreSearchUFS.cc UFSSwapLogParser.lo: ufs/UFSSwapLogParser.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSSwapLogParser.lo -MD -MP -MF $(DEPDIR)/UFSSwapLogParser.Tpo -c -o UFSSwapLogParser.lo `test -f 'ufs/UFSSwapLogParser.cc' || echo '$(srcdir)/'`ufs/UFSSwapLogParser.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/UFSSwapLogParser.Tpo $(DEPDIR)/UFSSwapLogParser.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/UFSSwapLogParser.cc' object='UFSSwapLogParser.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UFSSwapLogParser.lo -MD -MP -MF $(DEPDIR)/UFSSwapLogParser.Tpo -c -o UFSSwapLogParser.lo `test -f 'ufs/UFSSwapLogParser.cc' || echo '$(srcdir)/'`ufs/UFSSwapLogParser.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/UFSSwapLogParser.Tpo $(DEPDIR)/UFSSwapLogParser.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/UFSSwapLogParser.cc' object='UFSSwapLogParser.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSSwapLogParser.lo `test -f 'ufs/UFSSwapLogParser.cc' || echo '$(srcdir)/'`ufs/UFSSwapLogParser.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UFSSwapLogParser.lo `test -f 'ufs/UFSSwapLogParser.cc' || echo '$(srcdir)/'`ufs/UFSSwapLogParser.cc RebuildState.lo: ufs/RebuildState.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RebuildState.lo -MD -MP -MF $(DEPDIR)/RebuildState.Tpo -c -o RebuildState.lo `test -f 'ufs/RebuildState.cc' || echo '$(srcdir)/'`ufs/RebuildState.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/RebuildState.Tpo $(DEPDIR)/RebuildState.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ufs/RebuildState.cc' object='RebuildState.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RebuildState.lo -MD -MP -MF $(DEPDIR)/RebuildState.Tpo -c -o RebuildState.lo `test -f 'ufs/RebuildState.cc' || echo '$(srcdir)/'`ufs/RebuildState.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/RebuildState.Tpo $(DEPDIR)/RebuildState.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ufs/RebuildState.cc' object='RebuildState.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RebuildState.lo `test -f 'ufs/RebuildState.cc' || echo '$(srcdir)/'`ufs/RebuildState.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RebuildState.lo `test -f 'ufs/RebuildState.cc' || echo '$(srcdir)/'`ufs/RebuildState.cc mostlyclean-libtool: -rm -f *.lo @@ -673,26 +991,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -704,15 +1011,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -721,101 +1024,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -863,11 +1252,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -952,19 +1349,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ftp.cc squid-3.4.4.1/src/ftp.cc --- squid-3.4.4/src/ftp.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/ftp.cc 2014-04-23 05:50:18.000000000 -0700 @@ -3510,7 +3510,7 @@ break; case ERR_READ_TIMEOUT: - ftperr = new ErrorState(error, Http::scGateway_Timeout, fwd->request); + ftperr = new ErrorState(error, Http::scGatewayTimeout, fwd->request); break; default: diff -u -r -N squid-3.4.4/src/FwdState.cc squid-3.4.4.1/src/FwdState.cc --- squid-3.4.4/src/FwdState.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/FwdState.cc 2014-04-23 05:50:18.000000000 -0700 @@ -1053,7 +1053,7 @@ assert(fd == serverDestinations[0]->fd); if (entry->isEmpty()) { - ErrorState *anErr = new ErrorState(ERR_CONNECT_FAIL, Http::scGateway_Timeout, request); + ErrorState *anErr = new ErrorState(ERR_CONNECT_FAIL, Http::scGatewayTimeout, request); anErr->xerrno = ETIMEDOUT; fail(anErr); @@ -1384,7 +1384,7 @@ FwdState::makeConnectingError(const err_type type) const { return new ErrorState(type, request->flags.needValidation ? - Http::scGateway_Timeout : Http::scServiceUnavailable, request); + Http::scGatewayTimeout : Http::scServiceUnavailable, request); } static void @@ -1423,7 +1423,7 @@ case Http::scBadGateway: - case Http::scGateway_Timeout: + case Http::scGatewayTimeout: return true; case Http::scForbidden: diff -u -r -N squid-3.4.4/src/globals.h squid-3.4.4.1/src/globals.h --- squid-3.4.4/src/globals.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/globals.h 2014-04-23 05:50:18.000000000 -0700 @@ -126,9 +126,6 @@ extern char *WIN32_Service_Command_Line; /* NULL */ extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */ #endif -#if HAVE_SBRK -extern void *sbrk_start; /* 0 */ -#endif extern int ssl_ex_index_server; /* -1 */ extern int ssl_ctx_ex_index_dont_verify_domain; /* -1 */ diff -u -r -N squid-3.4.4/src/gopher.cc squid-3.4.4.1/src/gopher.cc --- squid-3.4.4/src/gopher.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/gopher.cc 2014-04-23 05:50:18.000000000 -0700 @@ -726,7 +726,7 @@ GopherStateData *gopherState = static_cast(io.data); debugs(10, 4, HERE << io.conn << ": '" << gopherState->entry->url() << "'" ); - gopherState->fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGateway_Timeout, gopherState->fwd->request)); + gopherState->fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGatewayTimeout, gopherState->fwd->request)); if (Comm::IsConnOpen(io.conn)) io.conn->close(); diff -u -r -N squid-3.4.4/src/http/Makefile.in squid-3.4.4.1/src/http/Makefile.in --- squid-3.4.4/src/http/Makefile.in 2014-03-09 01:41:55.000000000 -0800 +++ squid-3.4.4.1/src/http/Makefile.in 2014-04-23 05:51:32.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/http @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libsquid_http_la_OBJECTS = MethodType.lo StatusCode.lo \ StatusLine.lo libsquid_http_la_OBJECTS = $(am_libsquid_http_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsquid_http_la_SOURCES) DIST_SOURCES = $(libsquid_http_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -373,7 +683,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -395,6 +705,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -407,14 +718,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsquid-http.la: $(libsquid_http_la_OBJECTS) $(libsquid_http_la_DEPENDENCIES) - $(CXXLINK) $(libsquid_http_la_OBJECTS) $(libsquid_http_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsquid-http.la: $(libsquid_http_la_OBJECTS) $(libsquid_http_la_DEPENDENCIES) $(EXTRA_libsquid_http_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libsquid_http_la_OBJECTS) $(libsquid_http_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -436,25 +750,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatusLine.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -462,26 +776,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -493,15 +796,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -510,101 +809,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -652,11 +1037,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -741,19 +1134,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/http/MethodType.h squid-3.4.4.1/src/http/MethodType.h --- squid-3.4.4/src/http/MethodType.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/http/MethodType.h 2014-04-23 05:50:18.000000000 -0700 @@ -4,8 +4,10 @@ namespace Http { -// see IANA registry: -// also: https://datatracker.ietf.org/doc/draft-ietf-httpbis-method-registrations +/* + * The IANA registry for HTTP status codes can be found at: + * http://www.iana.org/assignments/http-methods/http-methods.xhtml + */ typedef enum _method_t { METHOD_NONE = 0, diff -u -r -N squid-3.4.4/src/http/StatusCode.cc squid-3.4.4.1/src/http/StatusCode.cc --- squid-3.4.4/src/http/StatusCode.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/http/StatusCode.cc 2014-04-23 05:50:18.000000000 -0700 @@ -7,10 +7,12 @@ { switch (status) { + // 000 case Http::scNone: return "Init"; /* we init .status with code 0 */ break; + // 100-199 case Http::scContinue: return "Continue"; break; @@ -19,6 +21,11 @@ return "Switching Protocols"; break; + case Http::scProcessing: + return "Processing"; + break; + + // 200-299 case Http::scOkay: return "OK"; break; @@ -51,6 +58,15 @@ return "Multi-Status"; break; + case Http::scAlreadyReported: + return "Already Reported"; + break; + + case Http::scImUsed: + return "IM Used"; + break; + + // 300-399 case Http::scMultipleChoices: return "Multiple Choices"; break; @@ -59,8 +75,8 @@ return "Moved Permanently"; break; - case Http::scMovedTemporarily: - return "Moved Temporarily"; + case Http::scFound: + return "Found"; break; case Http::scSeeOther: @@ -83,6 +99,7 @@ return "Permanent Redirect"; break; + // 400-499 case Http::scBadRequest: return "Bad Request"; break; @@ -116,7 +133,7 @@ break; case Http::scRequestTimeout: - return "Request Time-out"; + return "Request Timeout"; break; case Http::scConflict: @@ -135,12 +152,12 @@ return "Precondition Failed"; break; - case Http::scRequestEntityTooLarge: - return "Request Entity Too Large"; + case Http::scPayloadTooLarge: + return "Payload Too Large"; break; - case Http::scRequestUriTooLarge: - return "Request-URI Too Large"; + case Http::scUriTooLong: + return "URI Too Long"; break; case Http::scUnsupportedMediaType: @@ -155,6 +172,35 @@ return "Expectation Failed"; break; + case Http::scUnprocessableEntity: + return "Unprocessable Entity"; + break; + + case Http::scLocked: + return "Locked"; + break; + + case Http::scFailedDependency: + return "Failed Dependency"; + break; + + case Http::scUpgradeRequired: + return "Upgrade Required"; + break; + + case Http::scPreconditionRequired: + return "Precondition Required"; + break; + + case Http::scTooManyRequests: + return "Too Many Requests"; + break; + + case Http::scRequestHeaderFieldsTooLarge: + return "Request Header Fields Too Large"; + break; + + // 500-599 case Http::scInternalServerError: return "Internal Server Error"; break; @@ -171,33 +217,41 @@ return "Service Unavailable"; break; - case Http::scGateway_Timeout: - return "Gateway Time-out"; + case Http::scGatewayTimeout: + return "Gateway Timeout"; break; case Http::scHttpVersionNotSupported: return "HTTP Version not supported"; break; - // RFC 6585 - case Http::scPreconditionRequired: // 428 - return "Precondition Required"; + case Http::scVariantAlsoNegotiates: + return "Variant Also Negotiates"; break; - case Http::scTooManyFields: // 429 - return "Too Many Requests"; + case Http::scInsufficientStorage: + return "Insufficient Storage"; break; - case Http::scRequestHeaderFieldsTooLarge: // 431 - return "Request Header Fields Too Large"; + case Http::scLoopDetected: + return "Loop Detected"; break; - case Http::scNetworkAuthenticationRequired: // 511 + case Http::scNotExtended: + return "Not Extended"; + break; + + case Http::scNetworkAuthenticationRequired: return "Network Authentication Required"; break; + // 600+ + case Http::scInvalidHeader: + case Http::scHeaderTooLarge: + // fall through to default. + default: - debugs(57, 3, "Unknown HTTP status code: " << status); - return "Unknown"; + debugs(57, 3, "Unassigned HTTP status code: " << status); } + return "Unassigned"; } diff -u -r -N squid-3.4.4/src/http/StatusCode.h squid-3.4.4.1/src/http/StatusCode.h --- squid-3.4.4/src/http/StatusCode.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/http/StatusCode.h 2014-04-23 05:50:18.000000000 -0700 @@ -6,6 +6,8 @@ /** * These basic HTTP reply status codes are defined by RFC 2616 unless otherwise stated. + * The IANA registry for HTTP status codes can be found at: + * http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml */ typedef enum { scNone = 0, @@ -19,15 +21,17 @@ scNoContent = 204, scResetContent = 205, scPartialContent = 206, - scMultiStatus = 207, /**< RFC2518 section 10.2 */ + scMultiStatus = 207, /**< RFC2518 section 10.2 / RFC4918 */ + scAlreadyReported = 208, /**< RFC5842 */ + scImUsed = 226, /**< RFC3229 */ scMultipleChoices = 300, scMovedPermanently = 301, - scMovedTemporarily = 302, + scFound = 302, scSeeOther = 303, scNotModified = 304, scUseProxy = 305, scTemporaryRedirect = 307, - scPermanentRedirect = 308, + scPermanentRedirect = 308, /**< RFC-reschke-http-status-308-07 */ scBadRequest = 400, scUnauthorized = 401, scPaymentRequired = 402, @@ -41,28 +45,32 @@ scGone = 410, scLengthRequired = 411, scPreconditionFailed = 412, - scRequestEntityTooLarge = 413, - scRequestUriTooLarge = 414, + scPayloadTooLarge = 413, + scUriTooLong = 414, scUnsupportedMediaType = 415, scRequestedRangeNotSatisfied = 416, scExpectationFailed = 417, - scUnprocessableEntity = 422, /**< RFC2518 section 10.3 */ - scLocked = 423, /**< RFC2518 section 10.4 */ - scFailedDependency = 424, /**< RFC2518 section 10.5 */ + scUnprocessableEntity = 422, /**< RFC2518 section 10.3 / RFC4918 */ + scLocked = 423, /**< RFC2518 section 10.4 / RFC4918 */ + scFailedDependency = 424, /**< RFC2518 section 10.5 / RFC4918 */ + scUpgradeRequired = 426, scPreconditionRequired = 428, /**< RFC6585 */ - scTooManyFields = 429, /**< RFC6585 */ + scTooManyRequests = 429, /**< RFC6585 */ scRequestHeaderFieldsTooLarge = 431, /**< RFC6585 */ scInternalServerError = 500, scNotImplemented = 501, scBadGateway = 502, scServiceUnavailable = 503, - scGateway_Timeout = 504, + scGatewayTimeout = 504, scHttpVersionNotSupported = 505, - scInsufficientStorage = 507, /**< RFC2518 section 10.6 */ + scVariantAlsoNegotiates = 506, /**< RFC2295 */ + scInsufficientStorage = 507, /**< RFC2518 section 10.6 / RFC4918 */ + scLoopDetected = 508, /**< RFC5842 */ + scNotExtended = 510, /**< RFC2774 */ scNetworkAuthenticationRequired = 511, /**< RFC6585 */ // The 6xx codes below are for internal use only: Bad requests result - // in scBadRequest; bad responses in scGateway_Timeout. + // in scBadRequest; bad responses in scGatewayTimeout. scInvalidHeader = 600, /**< Squid header parsing error */ scHeaderTooLarge = 601 /* Header too large to process */ diff -u -r -N squid-3.4.4/src/http.cc squid-3.4.4.1/src/http.cc --- squid-3.4.4/src/http.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/http.cc 2014-04-23 05:50:18.000000000 -0700 @@ -182,7 +182,7 @@ debugs(11, 4, HERE << serverConnection << ": '" << entry->url() << "'" ); if (entry->store_status == STORE_PENDING) { - fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGateway_Timeout, fwd->request)); + fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGatewayTimeout, fwd->request)); } serverConnection->close(); @@ -208,7 +208,7 @@ case Http::scMovedPermanently: - case Http::scMovedTemporarily: + case Http::scFound: case Http::scGone: @@ -487,7 +487,7 @@ /* Responses that only are cacheable if the server says so */ - case Http::scMovedTemporarily: + case Http::scFound: case Http::scTemporaryRedirect: if (rep->date <= 0) { debugs(22, 3, HERE << "NO because HTTP status " << rep->sline.status() << " and Date missing/invalid"); @@ -517,7 +517,7 @@ case Http::scMethodNotAllowed: - case Http::scRequestUriTooLarge: + case Http::scUriTooLong: case Http::scInternalServerError: @@ -527,8 +527,8 @@ case Http::scServiceUnavailable: - case Http::scGateway_Timeout: - debugs(22, 3, HERE << "MAYBE because HTTP status " << rep->sline.status()); + case Http::scGatewayTimeout: + debugs(22, 3, "MAYBE because HTTP status " << rep->sline.status()); return -1; /* NOTREACHED */ @@ -556,7 +556,7 @@ case Http::scConflict: case Http::scLengthRequired: case Http::scPreconditionFailed: - case Http::scRequestEntityTooLarge: + case Http::scPayloadTooLarge: case Http::scUnsupportedMediaType: case Http::scUnprocessableEntity: case Http::scLocked: @@ -2105,7 +2105,7 @@ Http::ProtocolVersion httpver(1,1); const char * url; if (_peer && !_peer->options.originserver) - url = entry->url(); + url = urlCanonical(request); else url = request->urlpath.termedBuf(); mb->Printf("%s %s %s/%d.%d\r\n", diff -u -r -N squid-3.4.4/src/icmp/Makefile.in squid-3.4.4.1/src/icmp/Makefile.in --- squid-3.4.4/src/icmp/Makefile.in 2014-03-09 01:41:55.000000000 -0800 +++ squid-3.4.4.1/src/icmp/Makefile.in 2014-04-23 05:51:33.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testIcmp$(EXEEXT) TESTS = testHeaders testIcmp$(EXEEXT) @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -51,7 +97,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -110,6 +156,10 @@ libicmp_core_la_LIBADD = am_libicmp_core_la_OBJECTS = Icmp.lo libicmp_core_la_OBJECTS = $(am_libicmp_core_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libicmp_la_LIBADD = am_libicmp_la_OBJECTS = IcmpSquid.lo net_db.lo libicmp_la_OBJECTS = $(am_libicmp_la_OBJECTS) @@ -128,52 +178,307 @@ am__DEPENDENCIES_3 = pinger_DEPENDENCIES = libicmp-core.la ../ip/libip.la \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) -pinger_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(pinger_LDFLAGS) $(LDFLAGS) -o $@ +pinger_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(pinger_LDFLAGS) $(LDFLAGS) -o $@ am_testIcmp_OBJECTS = testIcmp.$(OBJEXT) nodist_testIcmp_OBJECTS = testMain.$(OBJEXT) stub_debug.$(OBJEXT) \ time.$(OBJEXT) test_tools.$(OBJEXT) globals.$(OBJEXT) testIcmp_OBJECTS = $(am_testIcmp_OBJECTS) $(nodist_testIcmp_OBJECTS) -testIcmp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +testIcmp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(testIcmp_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libicmp_core_la_SOURCES) $(libicmp_la_SOURCES) \ $(pinger_SOURCES) $(nodist_pinger_SOURCES) $(testIcmp_SOURCES) \ $(nodist_testIcmp_SOURCES) DIST_SOURCES = $(libicmp_core_la_SOURCES) $(libicmp_la_SOURCES) \ $(pinger_SOURCES) $(testIcmp_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -215,6 +520,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -232,6 +538,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -269,11 +576,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -332,6 +641,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -474,7 +784,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -496,6 +806,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -508,16 +819,20 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libicmp-core.la: $(libicmp_core_la_OBJECTS) $(libicmp_core_la_DEPENDENCIES) - $(CXXLINK) $(libicmp_core_la_OBJECTS) $(libicmp_core_la_LIBADD) $(LIBS) -libicmp.la: $(libicmp_la_OBJECTS) $(libicmp_la_DEPENDENCIES) - $(CXXLINK) $(libicmp_la_OBJECTS) $(libicmp_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libicmp-core.la: $(libicmp_core_la_OBJECTS) $(libicmp_core_la_DEPENDENCIES) $(EXTRA_libicmp_core_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libicmp_core_la_OBJECTS) $(libicmp_core_la_LIBADD) $(LIBS) + +libicmp.la: $(libicmp_la_OBJECTS) $(libicmp_la_DEPENDENCIES) $(EXTRA_libicmp_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libicmp_la_OBJECTS) $(libicmp_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -529,14 +844,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -557,7 +877,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -570,12 +891,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -pinger$(EXEEXT): $(pinger_OBJECTS) $(pinger_DEPENDENCIES) + +pinger$(EXEEXT): $(pinger_OBJECTS) $(pinger_DEPENDENCIES) $(EXTRA_pinger_DEPENDENCIES) @rm -f pinger$(EXEEXT) - $(pinger_LINK) $(pinger_OBJECTS) $(pinger_LDADD) $(LIBS) -testIcmp$(EXEEXT): $(testIcmp_OBJECTS) $(testIcmp_DEPENDENCIES) + $(AM_V_CXXLD)$(pinger_LINK) $(pinger_OBJECTS) $(pinger_LDADD) $(LIBS) + +testIcmp$(EXEEXT): $(testIcmp_OBJECTS) $(testIcmp_DEPENDENCIES) $(EXTRA_testIcmp_DEPENDENCIES) @rm -f testIcmp$(EXEEXT) - $(testIcmp_LINK) $(testIcmp_OBJECTS) $(testIcmp_LDADD) $(LIBS) + $(AM_V_CXXLD)$(testIcmp_LINK) $(testIcmp_OBJECTS) $(testIcmp_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -602,151 +925,151 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< debug.o: $(top_srcdir)/src/debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.o -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.o `test -f '$(top_srcdir)/src/debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/debug.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/debug.cc' object='debug.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.o -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.o `test -f '$(top_srcdir)/src/debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/debug.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/debug.cc' object='debug.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.o `test -f '$(top_srcdir)/src/debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/debug.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.o `test -f '$(top_srcdir)/src/debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/debug.cc debug.obj: $(top_srcdir)/src/debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.obj -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.obj `if test -f '$(top_srcdir)/src/debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/debug.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/debug.cc' object='debug.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.obj -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.obj `if test -f '$(top_srcdir)/src/debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/debug.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/debug.cc' object='debug.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.obj `if test -f '$(top_srcdir)/src/debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/debug.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.obj `if test -f '$(top_srcdir)/src/debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/debug.cc'; fi` globals.o: $(top_builddir)/src/globals.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.o -MD -MP -MF $(DEPDIR)/globals.Tpo -c -o globals.o `test -f '$(top_builddir)/src/globals.cc' || echo '$(srcdir)/'`$(top_builddir)/src/globals.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/globals.Tpo $(DEPDIR)/globals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_builddir)/src/globals.cc' object='globals.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.o -MD -MP -MF $(DEPDIR)/globals.Tpo -c -o globals.o `test -f '$(top_builddir)/src/globals.cc' || echo '$(srcdir)/'`$(top_builddir)/src/globals.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/globals.Tpo $(DEPDIR)/globals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_builddir)/src/globals.cc' object='globals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.o `test -f '$(top_builddir)/src/globals.cc' || echo '$(srcdir)/'`$(top_builddir)/src/globals.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.o `test -f '$(top_builddir)/src/globals.cc' || echo '$(srcdir)/'`$(top_builddir)/src/globals.cc globals.obj: $(top_builddir)/src/globals.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.obj -MD -MP -MF $(DEPDIR)/globals.Tpo -c -o globals.obj `if test -f '$(top_builddir)/src/globals.cc'; then $(CYGPATH_W) '$(top_builddir)/src/globals.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/globals.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/globals.Tpo $(DEPDIR)/globals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_builddir)/src/globals.cc' object='globals.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.obj -MD -MP -MF $(DEPDIR)/globals.Tpo -c -o globals.obj `if test -f '$(top_builddir)/src/globals.cc'; then $(CYGPATH_W) '$(top_builddir)/src/globals.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/globals.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/globals.Tpo $(DEPDIR)/globals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_builddir)/src/globals.cc' object='globals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.obj `if test -f '$(top_builddir)/src/globals.cc'; then $(CYGPATH_W) '$(top_builddir)/src/globals.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/globals.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.obj `if test -f '$(top_builddir)/src/globals.cc'; then $(CYGPATH_W) '$(top_builddir)/src/globals.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/globals.cc'; fi` time.o: $(top_srcdir)/src/time.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.o -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.o `test -f '$(top_srcdir)/src/time.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/time.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/time.cc' object='time.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.o -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.o `test -f '$(top_srcdir)/src/time.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/time.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/time.cc' object='time.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.o `test -f '$(top_srcdir)/src/time.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/time.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.o `test -f '$(top_srcdir)/src/time.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/time.cc time.obj: $(top_srcdir)/src/time.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.obj -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.obj `if test -f '$(top_srcdir)/src/time.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/time.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/time.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/time.cc' object='time.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.obj -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.obj `if test -f '$(top_srcdir)/src/time.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/time.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/time.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/time.cc' object='time.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.obj `if test -f '$(top_srcdir)/src/time.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/time.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/time.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.obj `if test -f '$(top_srcdir)/src/time.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/time.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/time.cc'; fi` SquidConfig.o: $(top_srcdir)/src/SquidConfig.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidConfig.o -MD -MP -MF $(DEPDIR)/SquidConfig.Tpo -c -o SquidConfig.o `test -f '$(top_srcdir)/src/SquidConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidConfig.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SquidConfig.Tpo $(DEPDIR)/SquidConfig.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/SquidConfig.cc' object='SquidConfig.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidConfig.o -MD -MP -MF $(DEPDIR)/SquidConfig.Tpo -c -o SquidConfig.o `test -f '$(top_srcdir)/src/SquidConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidConfig.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SquidConfig.Tpo $(DEPDIR)/SquidConfig.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/SquidConfig.cc' object='SquidConfig.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidConfig.o `test -f '$(top_srcdir)/src/SquidConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidConfig.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidConfig.o `test -f '$(top_srcdir)/src/SquidConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidConfig.cc SquidConfig.obj: $(top_srcdir)/src/SquidConfig.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidConfig.obj -MD -MP -MF $(DEPDIR)/SquidConfig.Tpo -c -o SquidConfig.obj `if test -f '$(top_srcdir)/src/SquidConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidConfig.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SquidConfig.Tpo $(DEPDIR)/SquidConfig.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/SquidConfig.cc' object='SquidConfig.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidConfig.obj -MD -MP -MF $(DEPDIR)/SquidConfig.Tpo -c -o SquidConfig.obj `if test -f '$(top_srcdir)/src/SquidConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidConfig.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SquidConfig.Tpo $(DEPDIR)/SquidConfig.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/SquidConfig.cc' object='SquidConfig.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidConfig.obj `if test -f '$(top_srcdir)/src/SquidConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidConfig.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidConfig.obj `if test -f '$(top_srcdir)/src/SquidConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidConfig.cc'; fi` SquidNew.o: $(top_srcdir)/src/SquidNew.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidNew.o -MD -MP -MF $(DEPDIR)/SquidNew.Tpo -c -o SquidNew.o `test -f '$(top_srcdir)/src/SquidNew.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidNew.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SquidNew.Tpo $(DEPDIR)/SquidNew.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/SquidNew.cc' object='SquidNew.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidNew.o -MD -MP -MF $(DEPDIR)/SquidNew.Tpo -c -o SquidNew.o `test -f '$(top_srcdir)/src/SquidNew.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidNew.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SquidNew.Tpo $(DEPDIR)/SquidNew.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/SquidNew.cc' object='SquidNew.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidNew.o `test -f '$(top_srcdir)/src/SquidNew.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidNew.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidNew.o `test -f '$(top_srcdir)/src/SquidNew.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/SquidNew.cc SquidNew.obj: $(top_srcdir)/src/SquidNew.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidNew.obj -MD -MP -MF $(DEPDIR)/SquidNew.Tpo -c -o SquidNew.obj `if test -f '$(top_srcdir)/src/SquidNew.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidNew.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SquidNew.Tpo $(DEPDIR)/SquidNew.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/SquidNew.cc' object='SquidNew.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SquidNew.obj -MD -MP -MF $(DEPDIR)/SquidNew.Tpo -c -o SquidNew.obj `if test -f '$(top_srcdir)/src/SquidNew.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidNew.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SquidNew.Tpo $(DEPDIR)/SquidNew.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/SquidNew.cc' object='SquidNew.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidNew.obj `if test -f '$(top_srcdir)/src/SquidNew.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidNew.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidNew.obj `if test -f '$(top_srcdir)/src/SquidNew.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SquidNew.cc'; fi` stub_HelperChildConfig.o: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_HelperChildConfig.o -MD -MP -MF $(DEPDIR)/stub_HelperChildConfig.Tpo -c -o stub_HelperChildConfig.o `test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_HelperChildConfig.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_HelperChildConfig.Tpo $(DEPDIR)/stub_HelperChildConfig.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' object='stub_HelperChildConfig.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_HelperChildConfig.o -MD -MP -MF $(DEPDIR)/stub_HelperChildConfig.Tpo -c -o stub_HelperChildConfig.o `test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_HelperChildConfig.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_HelperChildConfig.Tpo $(DEPDIR)/stub_HelperChildConfig.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' object='stub_HelperChildConfig.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_HelperChildConfig.o `test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_HelperChildConfig.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_HelperChildConfig.o `test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_HelperChildConfig.cc stub_HelperChildConfig.obj: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_HelperChildConfig.obj -MD -MP -MF $(DEPDIR)/stub_HelperChildConfig.Tpo -c -o stub_HelperChildConfig.obj `if test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_HelperChildConfig.Tpo $(DEPDIR)/stub_HelperChildConfig.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' object='stub_HelperChildConfig.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_HelperChildConfig.obj -MD -MP -MF $(DEPDIR)/stub_HelperChildConfig.Tpo -c -o stub_HelperChildConfig.obj `if test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_HelperChildConfig.Tpo $(DEPDIR)/stub_HelperChildConfig.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_HelperChildConfig.cc' object='stub_HelperChildConfig.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_HelperChildConfig.obj `if test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_HelperChildConfig.obj `if test -f '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_HelperChildConfig.cc'; fi` testMain.o: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc testMain.obj: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` stub_debug.o: $(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.o -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.o -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc stub_debug.obj: $(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.obj -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.obj -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` test_tools.o: $(top_srcdir)/test-suite/test_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_tools.o -MD -MP -MF $(DEPDIR)/test_tools.Tpo -c -o test_tools.o `test -f '$(top_srcdir)/test-suite/test_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/test-suite/test_tools.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_tools.Tpo $(DEPDIR)/test_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/test-suite/test_tools.cc' object='test_tools.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_tools.o -MD -MP -MF $(DEPDIR)/test_tools.Tpo -c -o test_tools.o `test -f '$(top_srcdir)/test-suite/test_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/test-suite/test_tools.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_tools.Tpo $(DEPDIR)/test_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/test-suite/test_tools.cc' object='test_tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_tools.o `test -f '$(top_srcdir)/test-suite/test_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/test-suite/test_tools.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_tools.o `test -f '$(top_srcdir)/test-suite/test_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/test-suite/test_tools.cc test_tools.obj: $(top_srcdir)/test-suite/test_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_tools.obj -MD -MP -MF $(DEPDIR)/test_tools.Tpo -c -o test_tools.obj `if test -f '$(top_srcdir)/test-suite/test_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/test-suite/test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/test-suite/test_tools.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_tools.Tpo $(DEPDIR)/test_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/test-suite/test_tools.cc' object='test_tools.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_tools.obj -MD -MP -MF $(DEPDIR)/test_tools.Tpo -c -o test_tools.obj `if test -f '$(top_srcdir)/test-suite/test_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/test-suite/test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/test-suite/test_tools.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_tools.Tpo $(DEPDIR)/test_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/test-suite/test_tools.cc' object='test_tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_tools.obj `if test -f '$(top_srcdir)/test-suite/test_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/test-suite/test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/test-suite/test_tools.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_tools.obj `if test -f '$(top_srcdir)/test-suite/test_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/test-suite/test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/test-suite/test_tools.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -754,26 +1077,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -785,15 +1097,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -802,101 +1110,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testIcmp.log: testIcmp$(EXEEXT) + @p='testIcmp$(EXEEXT)'; \ + b='testIcmp'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -947,11 +1348,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1036,20 +1445,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ident/Makefile.in squid-3.4.4.1/src/ident/Makefile.in --- squid-3.4.4/src/ident/Makefile.in 2014-03-09 01:41:56.000000000 -0800 +++ squid-3.4.4.1/src/ident/Makefile.in 2014-04-23 05:51:33.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/ident @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,39 +152,298 @@ libident_la_LIBADD = am_libident_la_OBJECTS = AclIdent.lo Ident.lo libident_la_OBJECTS = $(am_libident_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libident_la_SOURCES) DIST_SOURCES = $(libident_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -177,6 +482,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -194,6 +500,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -231,11 +538,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -294,6 +603,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -370,7 +680,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -392,6 +702,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -404,14 +715,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libident.la: $(libident_la_OBJECTS) $(libident_la_DEPENDENCIES) - $(CXXLINK) $(libident_la_OBJECTS) $(libident_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libident.la: $(libident_la_OBJECTS) $(libident_la_DEPENDENCIES) $(EXTRA_libident_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libident_la_OBJECTS) $(libident_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -432,25 +746,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ident.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -458,26 +772,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -489,15 +792,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -506,101 +805,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -648,11 +1033,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -737,19 +1130,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ip/Address.cc squid-3.4.4.1/src/ip/Address.cc --- squid-3.4.4/src/ip/Address.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/ip/Address.cc 2014-04-23 05:50:18.000000000 -0700 @@ -249,8 +249,8 @@ bool Ip::Address::isSiteLocalAuto() const { - return mSocketAddr_.sin6_addr.s6_addr[10] == static_cast(0xff) && - mSocketAddr_.sin6_addr.s6_addr[11] == static_cast(0xfe); + return mSocketAddr_.sin6_addr.s6_addr[11] == static_cast(0xff) && + mSocketAddr_.sin6_addr.s6_addr[12] == static_cast(0xfe); } bool diff -u -r -N squid-3.4.4/src/ip/Makefile.in squid-3.4.4.1/src/ip/Makefile.in --- squid-3.4.4/src/ip/Makefile.in 2014-03-09 01:41:56.000000000 -0800 +++ squid-3.4.4.1/src/ip/Makefile.in 2014-04-23 05:51:34.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testIpAddress$(EXEEXT) TESTS = testHeaders testIpAddress$(EXEEXT) @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -48,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,6 +153,10 @@ libip_la_LIBADD = am_libip_la_OBJECTS = Address.lo Intercept.lo QosConfig.lo tools.lo libip_la_OBJECTS = $(am_libip_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_testIpAddress_OBJECTS = testAddress.$(OBJEXT) nodist_testIpAddress_OBJECTS = stub_debug.$(OBJEXT) \ stub_tools.$(OBJEXT) testMain.$(OBJEXT) @@ -119,43 +169,299 @@ testIpAddress_DEPENDENCIES = libip.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -testIpAddress_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(testIpAddress_LDFLAGS) $(LDFLAGS) -o $@ +testIpAddress_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(testIpAddress_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libip_la_SOURCES) $(testIpAddress_SOURCES) \ $(nodist_testIpAddress_SOURCES) DIST_SOURCES = $(libip_la_SOURCES) $(testIpAddress_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -194,6 +500,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -211,6 +518,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -248,11 +556,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -311,6 +621,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -408,7 +719,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -430,6 +741,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -442,14 +754,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libip.la: $(libip_la_OBJECTS) $(libip_la_DEPENDENCIES) - $(CXXLINK) $(libip_la_OBJECTS) $(libip_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libip.la: $(libip_la_OBJECTS) $(libip_la_DEPENDENCIES) $(EXTRA_libip_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libip_la_OBJECTS) $(libip_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -459,9 +774,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -testIpAddress$(EXEEXT): $(testIpAddress_OBJECTS) $(testIpAddress_DEPENDENCIES) + +testIpAddress$(EXEEXT): $(testIpAddress_OBJECTS) $(testIpAddress_DEPENDENCIES) $(EXTRA_testIpAddress_DEPENDENCIES) @rm -f testIpAddress$(EXEEXT) - $(testIpAddress_LINK) $(testIpAddress_OBJECTS) $(testIpAddress_LDADD) $(LIBS) + $(AM_V_CXXLD)$(testIpAddress_LINK) $(testIpAddress_OBJECTS) $(testIpAddress_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -479,67 +795,67 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< stub_debug.o: $(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.o -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.o -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.o `test -f '$(top_srcdir)/src/tests/stub_debug.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_debug.cc stub_debug.obj: $(top_srcdir)/src/tests/stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.obj -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_debug.obj -MD -MP -MF $(DEPDIR)/stub_debug.Tpo -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_debug.Tpo $(DEPDIR)/stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_debug.cc' object='stub_debug.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_debug.obj `if test -f '$(top_srcdir)/src/tests/stub_debug.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_debug.cc'; fi` stub_tools.o: $(top_srcdir)/src/tests/stub_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_tools.o -MD -MP -MF $(DEPDIR)/stub_tools.Tpo -c -o stub_tools.o `test -f '$(top_srcdir)/src/tests/stub_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_tools.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_tools.Tpo $(DEPDIR)/stub_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_tools.cc' object='stub_tools.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_tools.o -MD -MP -MF $(DEPDIR)/stub_tools.Tpo -c -o stub_tools.o `test -f '$(top_srcdir)/src/tests/stub_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_tools.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_tools.Tpo $(DEPDIR)/stub_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_tools.cc' object='stub_tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_tools.o `test -f '$(top_srcdir)/src/tests/stub_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_tools.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_tools.o `test -f '$(top_srcdir)/src/tests/stub_tools.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/stub_tools.cc stub_tools.obj: $(top_srcdir)/src/tests/stub_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_tools.obj -MD -MP -MF $(DEPDIR)/stub_tools.Tpo -c -o stub_tools.obj `if test -f '$(top_srcdir)/src/tests/stub_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_tools.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stub_tools.Tpo $(DEPDIR)/stub_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/stub_tools.cc' object='stub_tools.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stub_tools.obj -MD -MP -MF $(DEPDIR)/stub_tools.Tpo -c -o stub_tools.obj `if test -f '$(top_srcdir)/src/tests/stub_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_tools.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stub_tools.Tpo $(DEPDIR)/stub_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/stub_tools.cc' object='stub_tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_tools.obj `if test -f '$(top_srcdir)/src/tests/stub_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_tools.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stub_tools.obj `if test -f '$(top_srcdir)/src/tests/stub_tools.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/stub_tools.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/stub_tools.cc'; fi` testMain.o: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '$(top_srcdir)/src/tests/testMain.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/tests/testMain.cc testMain.obj: $(top_srcdir)/src/tests/testMain.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF $(DEPDIR)/testMain.Tpo -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/testMain.Tpo $(DEPDIR)/testMain.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/src/tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '$(top_srcdir)/src/tests/testMain.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/tests/testMain.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -547,26 +863,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -578,15 +883,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -595,101 +896,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testIpAddress.log: testIpAddress$(EXEEXT) + @p='testIpAddress$(EXEEXT)'; \ + b='testIpAddress'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -737,11 +1131,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -826,19 +1228,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ipc/Makefile.in squid-3.4.4.1/src/ipc/Makefile.in --- squid-3.4.4/src/ipc/Makefile.in 2014-03-09 01:41:56.000000000 -0800 +++ squid-3.4.4.1/src/ipc/Makefile.in 2014-04-23 05:51:35.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/ipc @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -111,39 +157,298 @@ Inquirer.lo Page.lo PagePool.lo Pages.lo PageStack.lo \ Segment.lo libipc_la_OBJECTS = $(am_libipc_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libipc_la_SOURCES) DIST_SOURCES = $(libipc_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +487,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +505,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +543,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +608,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -424,7 +734,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -446,6 +756,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -458,14 +769,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libipc.la: $(libipc_la_OBJECTS) $(libipc_la_DEPENDENCIES) - $(CXXLINK) $(libipc_la_OBJECTS) $(libipc_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libipc.la: $(libipc_la_OBJECTS) $(libipc_la_DEPENDENCIES) $(EXTRA_libipc_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libipc_la_OBJECTS) $(libipc_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -507,60 +821,60 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UdsOp.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< Page.lo: mem/Page.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Page.lo -MD -MP -MF $(DEPDIR)/Page.Tpo -c -o Page.lo `test -f 'mem/Page.cc' || echo '$(srcdir)/'`mem/Page.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Page.Tpo $(DEPDIR)/Page.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mem/Page.cc' object='Page.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Page.lo -MD -MP -MF $(DEPDIR)/Page.Tpo -c -o Page.lo `test -f 'mem/Page.cc' || echo '$(srcdir)/'`mem/Page.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Page.Tpo $(DEPDIR)/Page.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mem/Page.cc' object='Page.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Page.lo `test -f 'mem/Page.cc' || echo '$(srcdir)/'`mem/Page.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Page.lo `test -f 'mem/Page.cc' || echo '$(srcdir)/'`mem/Page.cc PagePool.lo: mem/PagePool.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PagePool.lo -MD -MP -MF $(DEPDIR)/PagePool.Tpo -c -o PagePool.lo `test -f 'mem/PagePool.cc' || echo '$(srcdir)/'`mem/PagePool.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PagePool.Tpo $(DEPDIR)/PagePool.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mem/PagePool.cc' object='PagePool.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PagePool.lo -MD -MP -MF $(DEPDIR)/PagePool.Tpo -c -o PagePool.lo `test -f 'mem/PagePool.cc' || echo '$(srcdir)/'`mem/PagePool.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/PagePool.Tpo $(DEPDIR)/PagePool.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mem/PagePool.cc' object='PagePool.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PagePool.lo `test -f 'mem/PagePool.cc' || echo '$(srcdir)/'`mem/PagePool.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PagePool.lo `test -f 'mem/PagePool.cc' || echo '$(srcdir)/'`mem/PagePool.cc Pages.lo: mem/Pages.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Pages.lo -MD -MP -MF $(DEPDIR)/Pages.Tpo -c -o Pages.lo `test -f 'mem/Pages.cc' || echo '$(srcdir)/'`mem/Pages.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Pages.Tpo $(DEPDIR)/Pages.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mem/Pages.cc' object='Pages.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Pages.lo -MD -MP -MF $(DEPDIR)/Pages.Tpo -c -o Pages.lo `test -f 'mem/Pages.cc' || echo '$(srcdir)/'`mem/Pages.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Pages.Tpo $(DEPDIR)/Pages.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mem/Pages.cc' object='Pages.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Pages.lo `test -f 'mem/Pages.cc' || echo '$(srcdir)/'`mem/Pages.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Pages.lo `test -f 'mem/Pages.cc' || echo '$(srcdir)/'`mem/Pages.cc PageStack.lo: mem/PageStack.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageStack.lo -MD -MP -MF $(DEPDIR)/PageStack.Tpo -c -o PageStack.lo `test -f 'mem/PageStack.cc' || echo '$(srcdir)/'`mem/PageStack.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PageStack.Tpo $(DEPDIR)/PageStack.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mem/PageStack.cc' object='PageStack.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageStack.lo -MD -MP -MF $(DEPDIR)/PageStack.Tpo -c -o PageStack.lo `test -f 'mem/PageStack.cc' || echo '$(srcdir)/'`mem/PageStack.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/PageStack.Tpo $(DEPDIR)/PageStack.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mem/PageStack.cc' object='PageStack.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageStack.lo `test -f 'mem/PageStack.cc' || echo '$(srcdir)/'`mem/PageStack.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageStack.lo `test -f 'mem/PageStack.cc' || echo '$(srcdir)/'`mem/PageStack.cc Segment.lo: mem/Segment.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Segment.lo -MD -MP -MF $(DEPDIR)/Segment.Tpo -c -o Segment.lo `test -f 'mem/Segment.cc' || echo '$(srcdir)/'`mem/Segment.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Segment.Tpo $(DEPDIR)/Segment.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mem/Segment.cc' object='Segment.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Segment.lo -MD -MP -MF $(DEPDIR)/Segment.Tpo -c -o Segment.lo `test -f 'mem/Segment.cc' || echo '$(srcdir)/'`mem/Segment.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Segment.Tpo $(DEPDIR)/Segment.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mem/Segment.cc' object='Segment.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Segment.lo `test -f 'mem/Segment.cc' || echo '$(srcdir)/'`mem/Segment.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Segment.lo `test -f 'mem/Segment.cc' || echo '$(srcdir)/'`mem/Segment.cc mostlyclean-libtool: -rm -f *.lo @@ -568,26 +882,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -599,15 +902,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -616,101 +915,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -758,11 +1143,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -847,19 +1240,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ipcache.cc squid-3.4.4.1/src/ipcache.cc --- squid-3.4.4/src/ipcache.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/ipcache.cc 2014-04-23 05:50:18.000000000 -0700 @@ -33,6 +33,7 @@ #include "squid.h" #include "cbdata.h" #include "CacheManager.h" +#include "dlink.h" #include "DnsLookupDetails.h" #include "event.h" #include "ip/Address.h" diff -u -r -N squid-3.4.4/src/log/Makefile.in squid-3.4.4.1/src/log/Makefile.in --- squid-3.4.4/src/log/Makefile.in 2014-03-09 01:41:56.000000000 -0800 +++ squid-3.4.4.1/src/log/Makefile.in 2014-04-23 05:51:35.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/log @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -110,39 +156,298 @@ FormatSquidReferer.lo FormatSquidUseragent.lo ModDaemon.lo \ ModStdio.lo ModSyslog.lo ModUdp.lo CustomLog.lo TcpLogger.lo liblog_la_OBJECTS = $(am_liblog_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(liblog_la_SOURCES) DIST_SOURCES = $(liblog_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -181,6 +486,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -198,6 +504,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -235,11 +542,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -298,6 +607,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -395,7 +705,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -417,6 +727,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -429,14 +740,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblog.la: $(liblog_la_OBJECTS) $(liblog_la_DEPENDENCIES) - $(CXXLINK) $(liblog_la_OBJECTS) $(liblog_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +liblog.la: $(liblog_la_OBJECTS) $(liblog_la_DEPENDENCIES) $(EXTRA_liblog_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(liblog_la_OBJECTS) $(liblog_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -471,25 +785,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_log.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -497,26 +811,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -528,15 +831,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -545,101 +844,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -687,11 +1072,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -776,19 +1169,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/main.cc squid-3.4.4.1/src/main.cc --- squid-3.4.4/src/main.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/main.cc 2014-04-23 05:50:18.000000000 -0700 @@ -501,13 +501,7 @@ fatal("Need to add -DMALLOC_DBG when compiling to use -mX option"); #endif - } else { -#if XMALLOC_TRACE - xmalloc_trace = !xmalloc_trace; -#else - fatal("Need to configure --enable-xmalloc-debug-trace to use -m option"); -#endif - } + } break; #if USE_WIN32_SERVICE @@ -1302,10 +1296,6 @@ { ConfigureCurrentKid(argv[0]); -#if HAVE_SBRK - sbrk_start = sbrk(0); -#endif - Debug::parseOptions(NULL); debug_log = stderr; @@ -1927,15 +1917,6 @@ mimeFreeMemory(); errorClean(); #endif -#if !XMALLOC_TRACE - - if (opt_no_daemon) { - file_close(0); - file_close(1); - file_close(2); - } - -#endif // clear StoreController Store::Root(NULL); @@ -1945,13 +1926,6 @@ memClean(); -#if XMALLOC_TRACE - - xmalloc_find_leaks(); - - debugs(1, DBG_CRITICAL, "Memory used after shutdown: " << xmalloc_total); - -#endif #if MEM_GEN_TRACE log_trace_done(); diff -u -r -N squid-3.4.4/src/Makefile.am squid-3.4.4.1/src/Makefile.am --- squid-3.4.4/src/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -638,6 +638,7 @@ $(DISK_LINKOBJS) \ $(REPL_OBJS) \ $(DISK_OS_LIBS) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(REGEXLIB) \ $(ADAPTATION_LIBS) \ @@ -773,6 +774,7 @@ mgr/libmgr.la \ $(XTRA_OBJS) \ $(REPL_OBJS) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(REGEXLIB) \ $(SSLLIB) \ @@ -1221,6 +1223,7 @@ $(top_builddir)/lib/libmiscutil.la \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ + $(NETTLELIB) \ $(SSLLIB) \ $(COMPAT_LIB) \ $(XTRA_LIBS) @@ -1361,6 +1364,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(DISK_OS_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -1625,6 +1629,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -1804,6 +1809,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -2054,6 +2060,7 @@ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -2304,6 +2311,7 @@ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -2548,6 +2556,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -2830,6 +2839,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(DISK_OS_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -3003,6 +3013,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -3237,6 +3248,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -3410,6 +3422,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -3821,6 +3834,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(COMPAT_LIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ diff -u -r -N squid-3.4.4/src/Makefile.in squid-3.4.4.1/src/Makefile.in --- squid-3.4.4/src/Makefile.in 2014-03-09 01:41:52.000000000 -0800 +++ squid-3.4.4.1/src/Makefile.in 2014-04-23 05:51:23.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -26,6 +25,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,10 +88,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/tests/Stub.list \ - $(top_srcdir)/doc/manuals/Substitute.am \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list \ + $(top_srcdir)/doc/manuals/Substitute.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(noinst_HEADERS) $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = $(am__EXEEXT_1) tests/testBoilerplate$(EXEEXT) \ tests/testCacheManager$(EXEEXT) tests/testDiskIO$(EXEEXT) \ tests/testEvent$(EXEEXT) tests/testEventLoop$(EXEEXT) \ @@ -86,7 +130,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -143,6 +187,10 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libAIO_a_AR = $(AR) $(ARFLAGS) libAIO_a_LIBADD = am__libAIO_a_SOURCES_DIST = DiskIO/AIO/aio_win32.cc \ @@ -212,6 +260,10 @@ am_libsquid_la_OBJECTS = comm.lo CommCalls.lo DescriptorSet.lo \ SquidConfig.lo libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" \ "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)" @@ -446,9 +498,9 @@ @ENABLE_SNMP_TRUE@am__DEPENDENCIES_5 = snmp/libsnmp.la \ @ENABLE_SNMP_TRUE@ $(am__DEPENDENCIES_3) @USE_LOADABLE_MODULES_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_3) -squid_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(squid_LDFLAGS) $(LDFLAGS) -o $@ +squid_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(squid_LDFLAGS) $(LDFLAGS) -o $@ am_testRefCount_OBJECTS = tests/stub_cbdata.$(OBJEXT) \ tests/stub_debug.$(OBJEXT) tests/stub_MemBuf.$(OBJEXT) \ tests/testRefCount.$(OBJEXT) @@ -508,19 +560,21 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) -tests_testACLMaxUserIP_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testACLMaxUserIP_LDFLAGS) $(LDFLAGS) -o $@ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +tests_testACLMaxUserIP_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testACLMaxUserIP_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testBoilerplate_OBJECTS = tests/testBoilerplate.$(OBJEXT) \ tests/testMain.$(OBJEXT) time.$(OBJEXT) nodist_tests_testBoilerplate_OBJECTS = $(am__objects_23) tests_testBoilerplate_OBJECTS = $(am_tests_testBoilerplate_OBJECTS) \ $(nodist_tests_testBoilerplate_OBJECTS) -tests_testBoilerplate_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testBoilerplate_LDFLAGS) $(LDFLAGS) -o $@ +tests_testBoilerplate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testBoilerplate_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testCacheManager_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc debug.cc HttpParser.cc HttpParser.h RequestFlags.h \ RequestFlags.cc HttpRequest.cc HttpRequestMethod.cc Mem.h \ @@ -644,9 +698,10 @@ $(am__objects_21) tests_testCacheManager_OBJECTS = $(am_tests_testCacheManager_OBJECTS) \ $(nodist_tests_testCacheManager_OBJECTS) -tests_testCacheManager_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testCacheManager_LDFLAGS) $(LDFLAGS) -o $@ +tests_testCacheManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testCacheManager_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testConfigParser_OBJECTS = mem.$(OBJEXT) MemBuf.$(OBJEXT) \ String.$(OBJEXT) ConfigParser.$(OBJEXT) \ tests/stub_fatal.$(OBJEXT) tests/testMain.$(OBJEXT) \ @@ -657,9 +712,10 @@ nodist_tests_testConfigParser_OBJECTS = $(am__objects_23) tests_testConfigParser_OBJECTS = $(am_tests_testConfigParser_OBJECTS) \ $(nodist_tests_testConfigParser_OBJECTS) -tests_testConfigParser_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testConfigParser_LDFLAGS) $(LDFLAGS) -o $@ +tests_testConfigParser_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testConfigParser_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testCoss_SOURCES_DIST = tests/testCoss.cc tests/testMain.cc \ tests/testCoss.h tests/stub_cache_manager.cc client_db.h \ tests/stub_client_db.cc tests/stub_debug.cc \ @@ -752,9 +808,10 @@ SquidMath.$(OBJEXT) $(am__objects_23) $(am__objects_21) tests_testCoss_OBJECTS = $(am_tests_testCoss_OBJECTS) \ $(nodist_tests_testCoss_OBJECTS) -tests_testCoss_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testCoss_LDFLAGS) $(LDFLAGS) -o $@ +tests_testCoss_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testCoss_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testDiskIO_SOURCES_DIST = CacheDigest.h CacheDigest.cc \ cbdata.cc client_db.h ClientInfo.h ConfigOption.cc \ ConfigParser.cc CommonPool.h CompositePoolNode.h \ @@ -855,9 +912,10 @@ SquidMath.$(OBJEXT) swap_log_op.$(OBJEXT) tests_testDiskIO_OBJECTS = $(am_tests_testDiskIO_OBJECTS) \ $(nodist_tests_testDiskIO_OBJECTS) -tests_testDiskIO_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testDiskIO_LDFLAGS) $(LDFLAGS) -o $@ +tests_testDiskIO_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testDiskIO_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testEvent_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc BodyPipe.cc CacheDigest.h CacheDigest.cc cache_cf.h \ AuthReg.h YesNoNone.h YesNoNone.cc RefreshPattern.h \ @@ -980,9 +1038,10 @@ nodist_tests_testEvent_OBJECTS = $(am__objects_22) $(am__objects_21) tests_testEvent_OBJECTS = $(am_tests_testEvent_OBJECTS) \ $(nodist_tests_testEvent_OBJECTS) -tests_testEvent_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testEvent_LDFLAGS) $(LDFLAGS) -o $@ +tests_testEvent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testEvent_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testEventLoop_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc BodyPipe.cc CacheDigest.h CacheDigest.cc \ cache_manager.cc cache_cf.h AuthReg.h YesNoNone.h YesNoNone.cc \ @@ -1105,9 +1164,10 @@ $(am__objects_21) tests_testEventLoop_OBJECTS = $(am_tests_testEventLoop_OBJECTS) \ $(nodist_tests_testEventLoop_OBJECTS) -tests_testEventLoop_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testEventLoop_LDFLAGS) $(LDFLAGS) -o $@ +tests_testEventLoop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testEventLoop_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testHttpParser_OBJECTS = HttpParser.$(OBJEXT) \ MemBuf.$(OBJEXT) mem.$(OBJEXT) String.$(OBJEXT) \ tests/stub_cache_cf.$(OBJEXT) \ @@ -1119,9 +1179,10 @@ nodist_tests_testHttpParser_OBJECTS = $(am__objects_23) tests_testHttpParser_OBJECTS = $(am_tests_testHttpParser_OBJECTS) \ $(nodist_tests_testHttpParser_OBJECTS) -tests_testHttpParser_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testHttpParser_LDFLAGS) $(LDFLAGS) -o $@ +tests_testHttpParser_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testHttpParser_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testHttpReply_OBJECTS = cbdata.$(OBJEXT) \ ConfigParser.$(OBJEXT) ETag.$(OBJEXT) \ tests/stub_fatal.$(OBJEXT) HttpBody.$(OBJEXT) \ @@ -1145,9 +1206,10 @@ nodist_tests_testHttpReply_OBJECTS = $(am__objects_23) tests_testHttpReply_OBJECTS = $(am_tests_testHttpReply_OBJECTS) \ $(nodist_tests_testHttpReply_OBJECTS) -tests_testHttpReply_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testHttpReply_LDFLAGS) $(LDFLAGS) -o $@ +tests_testHttpReply_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testHttpReply_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testHttpRequest_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc HttpParser.cc HttpParser.h RequestFlags.h \ RequestFlags.cc HttpRequest.cc HttpRequestMethod.cc Mem.h \ @@ -1264,9 +1326,10 @@ nodist_tests_testHttpRequest_OBJECTS = $(am__objects_22) tests_testHttpRequest_OBJECTS = $(am_tests_testHttpRequest_OBJECTS) \ $(nodist_tests_testHttpRequest_OBJECTS) -tests_testHttpRequest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testHttpRequest_LDFLAGS) $(LDFLAGS) -o $@ +tests_testHttpRequest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testHttpRequest_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testRock_SOURCES_DIST = cbdata.cc CacheDigest.h \ CacheDigest.cc ConfigOption.cc ConfigParser.cc disk.h disk.cc \ ETag.cc EventLoop.cc event.cc fatal.h fatal.cc fd.h fd.cc \ @@ -1360,9 +1423,10 @@ swap_log_op.$(OBJEXT) SquidMath.$(OBJEXT) $(am__objects_23) tests_testRock_OBJECTS = $(am_tests_testRock_OBJECTS) \ $(nodist_tests_testRock_OBJECTS) -tests_testRock_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testRock_LDFLAGS) $(LDFLAGS) -o $@ +tests_testRock_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testRock_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testStatHist_OBJECTS = cbdata.$(OBJEXT) \ tests/stub_fatal.$(OBJEXT) MemBuf.$(OBJEXT) StatHist.$(OBJEXT) \ String.$(OBJEXT) tests/stub_cache_manager.$(OBJEXT) \ @@ -1378,9 +1442,10 @@ nodist_tests_testStatHist_OBJECTS = $(am__objects_23) tests_testStatHist_OBJECTS = $(am_tests_testStatHist_OBJECTS) \ $(nodist_tests_testStatHist_OBJECTS) -tests_testStatHist_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testStatHist_LDFLAGS) $(LDFLAGS) -o $@ +tests_testStatHist_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testStatHist_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testStore_SOURCES_DIST = CacheDigest.h CacheDigest.cc \ cbdata.cc ClientInfo.h ConfigOption.cc ConfigParser.cc \ CommonPool.h CompositePoolNode.h delay_pools.cc DelayId.cc \ @@ -1480,9 +1545,10 @@ swap_log_op.$(OBJEXT) tests_testStore_OBJECTS = $(am_tests_testStore_OBJECTS) \ $(nodist_tests_testStore_OBJECTS) -tests_testStore_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testStore_LDFLAGS) $(LDFLAGS) -o $@ +tests_testStore_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testStore_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tests_testString_OBJECTS = mem.$(OBJEXT) MemBuf.$(OBJEXT) \ String.$(OBJEXT) tests/testMain.$(OBJEXT) \ tests/testString.$(OBJEXT) tests/stub_cache_cf.$(OBJEXT) \ @@ -1492,9 +1558,10 @@ nodist_tests_testString_OBJECTS = $(am__objects_23) tests_testString_OBJECTS = $(am_tests_testString_OBJECTS) \ $(nodist_tests_testString_OBJECTS) -tests_testString_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testString_LDFLAGS) $(LDFLAGS) -o $@ +tests_testString_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testString_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_testURL_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc BodyPipe.cc cache_cf.h AuthReg.h YesNoNone.h \ YesNoNone.cc RefreshPattern.h cache_cf.cc cache_manager.cc \ @@ -1615,9 +1682,10 @@ nodist_tests_testURL_OBJECTS = $(am__objects_22) tests_testURL_OBJECTS = $(am_tests_testURL_OBJECTS) \ $(nodist_tests_testURL_OBJECTS) -tests_testURL_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testURL_LDFLAGS) $(LDFLAGS) -o $@ +tests_testURL_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testURL_LDFLAGS) $(LDFLAGS) \ + -o $@ am__tests_testUfs_SOURCES_DIST = tests/testUfs.cc tests/testMain.cc \ tests/testUfs.h tests/stub_cache_manager.cc \ tests/stub_client_db.cc tests/stub_HelperChildConfig.cc \ @@ -1713,17 +1781,19 @@ SquidMath.$(OBJEXT) swap_log_op.$(OBJEXT) tests_testUfs_OBJECTS = $(am_tests_testUfs_OBJECTS) \ $(nodist_tests_testUfs_OBJECTS) -tests_testUfs_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testUfs_LDFLAGS) $(LDFLAGS) -o $@ +tests_testUfs_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testUfs_LDFLAGS) $(LDFLAGS) \ + -o $@ am_tests_testVector_OBJECTS = tests/testVector.$(OBJEXT) \ tests/testMain.$(OBJEXT) time.$(OBJEXT) nodist_tests_testVector_OBJECTS = $(am__objects_23) tests_testVector_OBJECTS = $(am_tests_testVector_OBJECTS) \ $(nodist_tests_testVector_OBJECTS) -tests_testVector_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_testVector_LDFLAGS) $(LDFLAGS) -o $@ +tests_testVector_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testVector_LDFLAGS) \ + $(LDFLAGS) -o $@ am__tests_test_http_range_SOURCES_DIST = AccessLogEntry.cc AclRegs.cc \ AuthReg.cc BodyPipe.cc cache_cf.h AuthReg.h YesNoNone.h \ YesNoNone.cc RefreshPattern.h cache_cf.cc cache_manager.cc \ @@ -1846,9 +1916,10 @@ $(am__objects_21) tests_test_http_range_OBJECTS = $(am_tests_test_http_range_OBJECTS) \ $(nodist_tests_test_http_range_OBJECTS) -tests_test_http_range_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(tests_test_http_range_LDFLAGS) $(LDFLAGS) -o $@ +tests_test_http_range_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(tests_test_http_range_LDFLAGS) \ + $(LDFLAGS) -o $@ am__ufsdump_SOURCES_DIST = ClientInfo.h cbdata.h cbdata.cc debug.cc \ int.h int.cc Mem.h mem.cc MemBuf.cc MemBuf.cci MemBuf.h \ Parsing.h store_key_md5.h store_key_md5.cc StoreMeta.cc \ @@ -1873,28 +1944,58 @@ am_unlinkd_OBJECTS = unlinkd_daemon.$(OBJEXT) unlinkd_OBJECTS = $(am_unlinkd_OBJECTS) unlinkd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libAIO_a_SOURCES) $(libBlocking_a_SOURCES) \ $(libDiskDaemon_a_SOURCES) $(libDiskThreads_a_SOURCES) \ $(EXTRA_libDiskThreads_a_SOURCES) $(libIpcIo_a_SOURCES) \ @@ -1958,13 +2059,19 @@ $(am__tests_testUfs_SOURCES_DIST) $(tests_testVector_SOURCES) \ $(am__tests_test_http_range_SOURCES_DIST) \ $(am__ufsdump_SOURCES_DIST) $(unlinkd_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -1986,6 +2093,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -1993,13 +2106,207 @@ HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -2030,6 +2337,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -2072,6 +2380,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -2089,6 +2398,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -2126,11 +2436,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -2189,6 +2501,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -2537,8 +2850,8 @@ eui/libeui.la http/libsquid-http.la icmp/libicmp.la \ icmp/libicmp-core.la log/liblog.la format/libformat.la \ $(XTRA_OBJS) $(DISK_LINKOBJS) $(REPL_OBJS) $(DISK_OS_LIBS) \ - $(CRYPTLIB) $(REGEXLIB) $(ADAPTATION_LIBS) $(ESI_LIBS) \ - $(SSL_LIBS) $(SNMP_LIBS) \ + $(NETTLELIB) $(CRYPTLIB) $(REGEXLIB) $(ADAPTATION_LIBS) \ + $(ESI_LIBS) $(SSL_LIBS) $(SNMP_LIBS) \ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la $(SSLLIB) $(EPOLL_LIBS) \ @@ -2630,6 +2943,7 @@ mgr/libmgr.la \ $(XTRA_OBJS) \ $(REPL_OBJS) \ + $(NETTLELIB) \ $(CRYPTLIB) \ $(REGEXLIB) \ $(SSLLIB) \ @@ -2967,6 +3281,7 @@ $(top_builddir)/lib/libmiscutil.la \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ + $(NETTLELIB) \ $(SSLLIB) \ $(COMPAT_LIB) \ $(XTRA_LIBS) @@ -3109,6 +3424,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(DISK_OS_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -3373,6 +3689,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -3555,6 +3872,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -3806,6 +4124,7 @@ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -4058,6 +4377,7 @@ ipc/libipc.la \ mgr/libmgr.la \ $(SNMP_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -4305,6 +4625,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -4592,6 +4913,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(DISK_OS_LIBS) \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -4764,6 +5086,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -5000,6 +5323,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -5176,6 +5500,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(REGEXLIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SSLLIB) \ @@ -5590,6 +5915,7 @@ $(top_builddir)/lib/libmisccontainers.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ + $(NETTLELIB) \ $(COMPAT_LIB) \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ @@ -5710,7 +6036,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list $(top_srcdir)/doc/manuals/Substitute.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -5732,6 +6058,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list $(top_srcdir)/doc/manuals/Substitute.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -5758,10 +6085,11 @@ DiskIO/AIO/$(DEPDIR)/$(am__dirstamp) DiskIO/AIO/AIODiskIOModule.$(OBJEXT): DiskIO/AIO/$(am__dirstamp) \ DiskIO/AIO/$(DEPDIR)/$(am__dirstamp) -libAIO.a: $(libAIO_a_OBJECTS) $(libAIO_a_DEPENDENCIES) - -rm -f libAIO.a - $(libAIO_a_AR) libAIO.a $(libAIO_a_OBJECTS) $(libAIO_a_LIBADD) - $(RANLIB) libAIO.a + +libAIO.a: $(libAIO_a_OBJECTS) $(libAIO_a_DEPENDENCIES) $(EXTRA_libAIO_a_DEPENDENCIES) + $(AM_V_at)-rm -f libAIO.a + $(AM_V_AR)$(libAIO_a_AR) libAIO.a $(libAIO_a_OBJECTS) $(libAIO_a_LIBADD) + $(AM_V_at)$(RANLIB) libAIO.a DiskIO/Blocking/$(am__dirstamp): @$(MKDIR_P) DiskIO/Blocking @: > DiskIO/Blocking/$(am__dirstamp) @@ -5777,10 +6105,11 @@ DiskIO/Blocking/BlockingDiskIOModule.$(OBJEXT): \ DiskIO/Blocking/$(am__dirstamp) \ DiskIO/Blocking/$(DEPDIR)/$(am__dirstamp) -libBlocking.a: $(libBlocking_a_OBJECTS) $(libBlocking_a_DEPENDENCIES) - -rm -f libBlocking.a - $(libBlocking_a_AR) libBlocking.a $(libBlocking_a_OBJECTS) $(libBlocking_a_LIBADD) - $(RANLIB) libBlocking.a + +libBlocking.a: $(libBlocking_a_OBJECTS) $(libBlocking_a_DEPENDENCIES) $(EXTRA_libBlocking_a_DEPENDENCIES) + $(AM_V_at)-rm -f libBlocking.a + $(AM_V_AR)$(libBlocking_a_AR) libBlocking.a $(libBlocking_a_OBJECTS) $(libBlocking_a_LIBADD) + $(AM_V_at)$(RANLIB) libBlocking.a DiskIO/DiskDaemon/$(am__dirstamp): @$(MKDIR_P) DiskIO/DiskDaemon @: > DiskIO/DiskDaemon/$(am__dirstamp) @@ -5799,10 +6128,11 @@ DiskIO/DiskDaemon/DiskdAction.$(OBJEXT): \ DiskIO/DiskDaemon/$(am__dirstamp) \ DiskIO/DiskDaemon/$(DEPDIR)/$(am__dirstamp) -libDiskDaemon.a: $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_DEPENDENCIES) - -rm -f libDiskDaemon.a - $(libDiskDaemon_a_AR) libDiskDaemon.a $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_LIBADD) - $(RANLIB) libDiskDaemon.a + +libDiskDaemon.a: $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_DEPENDENCIES) $(EXTRA_libDiskDaemon_a_DEPENDENCIES) + $(AM_V_at)-rm -f libDiskDaemon.a + $(AM_V_AR)$(libDiskDaemon_a_AR) libDiskDaemon.a $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_LIBADD) + $(AM_V_at)$(RANLIB) libDiskDaemon.a DiskIO/DiskThreads/$(am__dirstamp): @$(MKDIR_P) DiskIO/DiskThreads @: > DiskIO/DiskThreads/$(am__dirstamp) @@ -5830,10 +6160,11 @@ DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT): \ DiskIO/DiskThreads/$(am__dirstamp) \ DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp) -libDiskThreads.a: $(libDiskThreads_a_OBJECTS) $(libDiskThreads_a_DEPENDENCIES) - -rm -f libDiskThreads.a - $(libDiskThreads_a_AR) libDiskThreads.a $(libDiskThreads_a_OBJECTS) $(libDiskThreads_a_LIBADD) - $(RANLIB) libDiskThreads.a + +libDiskThreads.a: $(libDiskThreads_a_OBJECTS) $(libDiskThreads_a_DEPENDENCIES) $(EXTRA_libDiskThreads_a_DEPENDENCIES) + $(AM_V_at)-rm -f libDiskThreads.a + $(AM_V_AR)$(libDiskThreads_a_AR) libDiskThreads.a $(libDiskThreads_a_OBJECTS) $(libDiskThreads_a_LIBADD) + $(AM_V_at)$(RANLIB) libDiskThreads.a DiskIO/IpcIo/$(am__dirstamp): @$(MKDIR_P) DiskIO/IpcIo @: > DiskIO/IpcIo/$(am__dirstamp) @@ -5847,10 +6178,11 @@ DiskIO/IpcIo/IpcIoDiskIOModule.$(OBJEXT): \ DiskIO/IpcIo/$(am__dirstamp) \ DiskIO/IpcIo/$(DEPDIR)/$(am__dirstamp) -libIpcIo.a: $(libIpcIo_a_OBJECTS) $(libIpcIo_a_DEPENDENCIES) - -rm -f libIpcIo.a - $(libIpcIo_a_AR) libIpcIo.a $(libIpcIo_a_OBJECTS) $(libIpcIo_a_LIBADD) - $(RANLIB) libIpcIo.a + +libIpcIo.a: $(libIpcIo_a_OBJECTS) $(libIpcIo_a_DEPENDENCIES) $(EXTRA_libIpcIo_a_DEPENDENCIES) + $(AM_V_at)-rm -f libIpcIo.a + $(AM_V_AR)$(libIpcIo_a_AR) libIpcIo.a $(libIpcIo_a_OBJECTS) $(libIpcIo_a_LIBADD) + $(AM_V_at)$(RANLIB) libIpcIo.a DiskIO/Mmapped/$(am__dirstamp): @$(MKDIR_P) DiskIO/Mmapped @: > DiskIO/Mmapped/$(am__dirstamp) @@ -5865,31 +6197,40 @@ DiskIO/Mmapped/MmappedDiskIOModule.$(OBJEXT): \ DiskIO/Mmapped/$(am__dirstamp) \ DiskIO/Mmapped/$(DEPDIR)/$(am__dirstamp) -libMmapped.a: $(libMmapped_a_OBJECTS) $(libMmapped_a_DEPENDENCIES) - -rm -f libMmapped.a - $(libMmapped_a_AR) libMmapped.a $(libMmapped_a_OBJECTS) $(libMmapped_a_LIBADD) - $(RANLIB) libMmapped.a + +libMmapped.a: $(libMmapped_a_OBJECTS) $(libMmapped_a_DEPENDENCIES) $(EXTRA_libMmapped_a_DEPENDENCIES) + $(AM_V_at)-rm -f libMmapped.a + $(AM_V_AR)$(libMmapped_a_AR) libMmapped.a $(libMmapped_a_OBJECTS) $(libMmapped_a_LIBADD) + $(AM_V_at)$(RANLIB) libMmapped.a clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsquid.la: $(libsquid_la_OBJECTS) $(libsquid_la_DEPENDENCIES) - $(CXXLINK) $(libsquid_la_OBJECTS) $(libsquid_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsquid.la: $(libsquid_la_OBJECTS) $(libsquid_la_DEPENDENCIES) $(EXTRA_libsquid_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libsquid_la_OBJECTS) $(libsquid_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -5910,7 +6251,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -5934,14 +6276,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -5962,7 +6309,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -5986,14 +6334,19 @@ rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -6014,7 +6367,8 @@ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(sbindir)" && rm -f $$files @@ -6029,15 +6383,18 @@ rm -f $$list DiskIO/DiskDaemon/diskd.$(OBJEXT): DiskIO/DiskDaemon/$(am__dirstamp) \ DiskIO/DiskDaemon/$(DEPDIR)/$(am__dirstamp) -DiskIO/DiskDaemon/diskd$(EXEEXT): $(DiskIO_DiskDaemon_diskd_OBJECTS) $(DiskIO_DiskDaemon_diskd_DEPENDENCIES) DiskIO/DiskDaemon/$(am__dirstamp) + +DiskIO/DiskDaemon/diskd$(EXEEXT): $(DiskIO_DiskDaemon_diskd_OBJECTS) $(DiskIO_DiskDaemon_diskd_DEPENDENCIES) $(EXTRA_DiskIO_DiskDaemon_diskd_DEPENDENCIES) DiskIO/DiskDaemon/$(am__dirstamp) @rm -f DiskIO/DiskDaemon/diskd$(EXEEXT) - $(CXXLINK) $(DiskIO_DiskDaemon_diskd_OBJECTS) $(DiskIO_DiskDaemon_diskd_LDADD) $(LIBS) -dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(DiskIO_DiskDaemon_diskd_OBJECTS) $(DiskIO_DiskDaemon_diskd_LDADD) $(LIBS) + +dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES) $(EXTRA_dnsserver_DEPENDENCIES) @rm -f dnsserver$(EXEEXT) - $(CXXLINK) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS) -recv-announce$(EXEEXT): $(recv_announce_OBJECTS) $(recv_announce_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS) + +recv-announce$(EXEEXT): $(recv_announce_OBJECTS) $(recv_announce_DEPENDENCIES) $(EXTRA_recv_announce_DEPENDENCIES) @rm -f recv-announce$(EXEEXT) - $(CXXLINK) $(recv_announce_OBJECTS) $(recv_announce_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(recv_announce_OBJECTS) $(recv_announce_LDADD) $(LIBS) DiskIO/$(am__dirstamp): @$(MKDIR_P) DiskIO @: > DiskIO/$(am__dirstamp) @@ -6052,9 +6409,10 @@ DiskIO/$(DEPDIR)/$(am__dirstamp) DiskIO/DiskIOModules_gen.$(OBJEXT): DiskIO/$(am__dirstamp) \ DiskIO/$(DEPDIR)/$(am__dirstamp) -squid$(EXEEXT): $(squid_OBJECTS) $(squid_DEPENDENCIES) + +squid$(EXEEXT): $(squid_OBJECTS) $(squid_DEPENDENCIES) $(EXTRA_squid_DEPENDENCIES) @rm -f squid$(EXEEXT) - $(squid_LINK) $(squid_OBJECTS) $(squid_LDADD) $(LIBS) + $(AM_V_CXXLD)$(squid_LINK) $(squid_OBJECTS) $(squid_LDADD) $(LIBS) tests/$(am__dirstamp): @$(MKDIR_P) tests @: > tests/$(am__dirstamp) @@ -6069,9 +6427,10 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/testRefCount.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -testRefCount$(EXEEXT): $(testRefCount_OBJECTS) $(testRefCount_DEPENDENCIES) + +testRefCount$(EXEEXT): $(testRefCount_OBJECTS) $(testRefCount_DEPENDENCIES) $(EXTRA_testRefCount_DEPENDENCIES) @rm -f testRefCount$(EXEEXT) - $(CXXLINK) $(testRefCount_OBJECTS) $(testRefCount_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(testRefCount_OBJECTS) $(testRefCount_LDADD) $(LIBS) tests/stub_fatal.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_StatHist.$(OBJEXT): tests/$(am__dirstamp) \ @@ -6130,30 +6489,34 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/testMain.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testACLMaxUserIP$(EXEEXT): $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testACLMaxUserIP$(EXEEXT): $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_DEPENDENCIES) $(EXTRA_tests_testACLMaxUserIP_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testACLMaxUserIP$(EXEEXT) - $(tests_testACLMaxUserIP_LINK) $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testACLMaxUserIP_LINK) $(tests_testACLMaxUserIP_OBJECTS) $(tests_testACLMaxUserIP_LDADD) $(LIBS) tests/testBoilerplate.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testBoilerplate$(EXEEXT): $(tests_testBoilerplate_OBJECTS) $(tests_testBoilerplate_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testBoilerplate$(EXEEXT): $(tests_testBoilerplate_OBJECTS) $(tests_testBoilerplate_DEPENDENCIES) $(EXTRA_tests_testBoilerplate_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testBoilerplate$(EXEEXT) - $(tests_testBoilerplate_LINK) $(tests_testBoilerplate_OBJECTS) $(tests_testBoilerplate_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testBoilerplate_LINK) $(tests_testBoilerplate_OBJECTS) $(tests_testBoilerplate_LDADD) $(LIBS) tests/testCacheManager.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_main_cc.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_ipc_Forwarder.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testCacheManager$(EXEEXT): $(tests_testCacheManager_OBJECTS) $(tests_testCacheManager_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testCacheManager$(EXEEXT): $(tests_testCacheManager_OBJECTS) $(tests_testCacheManager_DEPENDENCIES) $(EXTRA_tests_testCacheManager_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testCacheManager$(EXEEXT) - $(tests_testCacheManager_LINK) $(tests_testCacheManager_OBJECTS) $(tests_testCacheManager_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testCacheManager_LINK) $(tests_testCacheManager_OBJECTS) $(tests_testCacheManager_LDADD) $(LIBS) tests/testConfigParser.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_HelperChildConfig.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testConfigParser$(EXEEXT): $(tests_testConfigParser_OBJECTS) $(tests_testConfigParser_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testConfigParser$(EXEEXT): $(tests_testConfigParser_OBJECTS) $(tests_testConfigParser_DEPENDENCIES) $(EXTRA_tests_testConfigParser_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testConfigParser$(EXEEXT) - $(tests_testConfigParser_LINK) $(tests_testConfigParser_OBJECTS) $(tests_testConfigParser_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testConfigParser_LINK) $(tests_testConfigParser_OBJECTS) $(tests_testConfigParser_LDADD) $(LIBS) tests/testCoss.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_client_db.$(OBJEXT): tests/$(am__dirstamp) \ @@ -6176,9 +6539,10 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/testStoreSupport.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testCoss$(EXEEXT): $(tests_testCoss_OBJECTS) $(tests_testCoss_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testCoss$(EXEEXT): $(tests_testCoss_OBJECTS) $(tests_testCoss_DEPENDENCIES) $(EXTRA_tests_testCoss_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testCoss$(EXEEXT) - $(tests_testCoss_LINK) $(tests_testCoss_OBJECTS) $(tests_testCoss_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testCoss_LINK) $(tests_testCoss_OBJECTS) $(tests_testCoss_LDADD) $(LIBS) tests/stub_icp.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_ipcache.$(OBJEXT): tests/$(am__dirstamp) \ @@ -6187,45 +6551,52 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/testDiskIO.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testDiskIO$(EXEEXT): $(tests_testDiskIO_OBJECTS) $(tests_testDiskIO_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testDiskIO$(EXEEXT): $(tests_testDiskIO_OBJECTS) $(tests_testDiskIO_DEPENDENCIES) $(EXTRA_tests_testDiskIO_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testDiskIO$(EXEEXT) - $(tests_testDiskIO_LINK) $(tests_testDiskIO_OBJECTS) $(tests_testDiskIO_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testDiskIO_LINK) $(tests_testDiskIO_OBJECTS) $(tests_testDiskIO_LDADD) $(LIBS) tests/testEvent.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testEvent$(EXEEXT): $(tests_testEvent_OBJECTS) $(tests_testEvent_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testEvent$(EXEEXT): $(tests_testEvent_OBJECTS) $(tests_testEvent_DEPENDENCIES) $(EXTRA_tests_testEvent_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testEvent$(EXEEXT) - $(tests_testEvent_LINK) $(tests_testEvent_OBJECTS) $(tests_testEvent_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testEvent_LINK) $(tests_testEvent_OBJECTS) $(tests_testEvent_LDADD) $(LIBS) tests/testEventLoop.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testEventLoop$(EXEEXT): $(tests_testEventLoop_OBJECTS) $(tests_testEventLoop_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testEventLoop$(EXEEXT): $(tests_testEventLoop_OBJECTS) $(tests_testEventLoop_DEPENDENCIES) $(EXTRA_tests_testEventLoop_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testEventLoop$(EXEEXT) - $(tests_testEventLoop_LINK) $(tests_testEventLoop_OBJECTS) $(tests_testEventLoop_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testEventLoop_LINK) $(tests_testEventLoop_OBJECTS) $(tests_testEventLoop_LDADD) $(LIBS) tests/stub_event.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/testHttpParser.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testHttpParser$(EXEEXT): $(tests_testHttpParser_OBJECTS) $(tests_testHttpParser_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testHttpParser$(EXEEXT): $(tests_testHttpParser_OBJECTS) $(tests_testHttpParser_DEPENDENCIES) $(EXTRA_tests_testHttpParser_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testHttpParser$(EXEEXT) - $(tests_testHttpParser_LINK) $(tests_testHttpParser_OBJECTS) $(tests_testHttpParser_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testHttpParser_LINK) $(tests_testHttpParser_OBJECTS) $(tests_testHttpParser_LDADD) $(LIBS) tests/testHttpReply.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testHttpReply$(EXEEXT): $(tests_testHttpReply_OBJECTS) $(tests_testHttpReply_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testHttpReply$(EXEEXT): $(tests_testHttpReply_OBJECTS) $(tests_testHttpReply_DEPENDENCIES) $(EXTRA_tests_testHttpReply_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testHttpReply$(EXEEXT) - $(tests_testHttpReply_LINK) $(tests_testHttpReply_OBJECTS) $(tests_testHttpReply_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testHttpReply_LINK) $(tests_testHttpReply_OBJECTS) $(tests_testHttpReply_LDADD) $(LIBS) tests/testHttpRequest.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/testHttpRequestMethod.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testHttpRequest$(EXEEXT): $(tests_testHttpRequest_OBJECTS) $(tests_testHttpRequest_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testHttpRequest$(EXEEXT): $(tests_testHttpRequest_OBJECTS) $(tests_testHttpRequest_DEPENDENCIES) $(EXTRA_tests_testHttpRequest_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testHttpRequest$(EXEEXT) - $(tests_testHttpRequest_LINK) $(tests_testHttpRequest_OBJECTS) $(tests_testHttpRequest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testHttpRequest_LINK) $(tests_testHttpRequest_OBJECTS) $(tests_testHttpRequest_LDADD) $(LIBS) tests/testRock.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_libmgr.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testRock$(EXEEXT): $(tests_testRock_OBJECTS) $(tests_testRock_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testRock$(EXEEXT): $(tests_testRock_OBJECTS) $(tests_testRock_DEPENDENCIES) $(EXTRA_tests_testRock_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testRock$(EXEEXT) - $(tests_testRock_LINK) $(tests_testRock_OBJECTS) $(tests_testRock_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testRock_LINK) $(tests_testRock_OBJECTS) $(tests_testRock_LDADD) $(LIBS) tests/stub_comm.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/stub_mem.$(OBJEXT): tests/$(am__dirstamp) \ @@ -6234,9 +6605,10 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/testStatHist.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testStatHist$(EXEEXT): $(tests_testStatHist_OBJECTS) $(tests_testStatHist_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testStatHist$(EXEEXT): $(tests_testStatHist_OBJECTS) $(tests_testStatHist_DEPENDENCIES) $(EXTRA_tests_testStatHist_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testStatHist$(EXEEXT) - $(tests_testStatHist_LINK) $(tests_testStatHist_OBJECTS) $(tests_testStatHist_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testStatHist_LINK) $(tests_testStatHist_OBJECTS) $(tests_testStatHist_LDADD) $(LIBS) tests/testStore.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/testStoreEntryStream.$(OBJEXT): tests/$(am__dirstamp) \ @@ -6247,152 +6619,61 @@ tests/$(DEPDIR)/$(am__dirstamp) tests/TestSwapDir.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testStore$(EXEEXT): $(tests_testStore_OBJECTS) $(tests_testStore_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testStore$(EXEEXT): $(tests_testStore_OBJECTS) $(tests_testStore_DEPENDENCIES) $(EXTRA_tests_testStore_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testStore$(EXEEXT) - $(tests_testStore_LINK) $(tests_testStore_OBJECTS) $(tests_testStore_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testStore_LINK) $(tests_testStore_OBJECTS) $(tests_testStore_LDADD) $(LIBS) tests/testString.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testString$(EXEEXT): $(tests_testString_OBJECTS) $(tests_testString_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testString$(EXEEXT): $(tests_testString_OBJECTS) $(tests_testString_DEPENDENCIES) $(EXTRA_tests_testString_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testString$(EXEEXT) - $(tests_testString_LINK) $(tests_testString_OBJECTS) $(tests_testString_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testString_LINK) $(tests_testString_OBJECTS) $(tests_testString_LDADD) $(LIBS) tests/testURL.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/testURLScheme.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testURL$(EXEEXT): $(tests_testURL_OBJECTS) $(tests_testURL_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testURL$(EXEEXT): $(tests_testURL_OBJECTS) $(tests_testURL_DEPENDENCIES) $(EXTRA_tests_testURL_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testURL$(EXEEXT) - $(tests_testURL_LINK) $(tests_testURL_OBJECTS) $(tests_testURL_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testURL_LINK) $(tests_testURL_OBJECTS) $(tests_testURL_LDADD) $(LIBS) tests/testUfs.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testUfs$(EXEEXT): $(tests_testUfs_OBJECTS) $(tests_testUfs_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testUfs$(EXEEXT): $(tests_testUfs_OBJECTS) $(tests_testUfs_DEPENDENCIES) $(EXTRA_tests_testUfs_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testUfs$(EXEEXT) - $(tests_testUfs_LINK) $(tests_testUfs_OBJECTS) $(tests_testUfs_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testUfs_LINK) $(tests_testUfs_OBJECTS) $(tests_testUfs_LDADD) $(LIBS) tests/testVector.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/testVector$(EXEEXT): $(tests_testVector_OBJECTS) $(tests_testVector_DEPENDENCIES) tests/$(am__dirstamp) + +tests/testVector$(EXEEXT): $(tests_testVector_OBJECTS) $(tests_testVector_DEPENDENCIES) $(EXTRA_tests_testVector_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/testVector$(EXEEXT) - $(tests_testVector_LINK) $(tests_testVector_OBJECTS) $(tests_testVector_LDADD) $(LIBS) + $(AM_V_CXXLD)$(tests_testVector_LINK) $(tests_testVector_OBJECTS) $(tests_testVector_LDADD) $(LIBS) tests/test_http_range.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) -tests/test_http_range$(EXEEXT): $(tests_test_http_range_OBJECTS) $(tests_test_http_range_DEPENDENCIES) tests/$(am__dirstamp) + +tests/test_http_range$(EXEEXT): $(tests_test_http_range_OBJECTS) $(tests_test_http_range_DEPENDENCIES) $(EXTRA_tests_test_http_range_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/test_http_range$(EXEEXT) - $(tests_test_http_range_LINK) $(tests_test_http_range_OBJECTS) $(tests_test_http_range_LDADD) $(LIBS) -ufsdump$(EXEEXT): $(ufsdump_OBJECTS) $(ufsdump_DEPENDENCIES) + $(AM_V_CXXLD)$(tests_test_http_range_LINK) $(tests_test_http_range_OBJECTS) $(tests_test_http_range_LDADD) $(LIBS) + +ufsdump$(EXEEXT): $(ufsdump_OBJECTS) $(ufsdump_DEPENDENCIES) $(EXTRA_ufsdump_DEPENDENCIES) @rm -f ufsdump$(EXEEXT) - $(CXXLINK) $(ufsdump_OBJECTS) $(ufsdump_LDADD) $(LIBS) -unlinkd$(EXEEXT): $(unlinkd_OBJECTS) $(unlinkd_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(ufsdump_OBJECTS) $(ufsdump_LDADD) $(LIBS) + +unlinkd$(EXEEXT): $(unlinkd_OBJECTS) $(unlinkd_DEPENDENCIES) $(EXTRA_unlinkd_DEPENDENCIES) @rm -f unlinkd$(EXEEXT) - $(CXXLINK) $(unlinkd_OBJECTS) $(unlinkd_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(unlinkd_OBJECTS) $(unlinkd_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f DiskIO/AIO/AIODiskFile.$(OBJEXT) - -rm -f DiskIO/AIO/AIODiskIOModule.$(OBJEXT) - -rm -f DiskIO/AIO/AIODiskIOStrategy.$(OBJEXT) - -rm -f DiskIO/AIO/aio_win32.$(OBJEXT) - -rm -f DiskIO/Blocking/BlockingDiskIOModule.$(OBJEXT) - -rm -f DiskIO/Blocking/BlockingFile.$(OBJEXT) - -rm -f DiskIO/Blocking/BlockingIOStrategy.$(OBJEXT) - -rm -f DiskIO/DiskDaemon/DiskDaemonDiskIOModule.$(OBJEXT) - -rm -f DiskIO/DiskDaemon/DiskdAction.$(OBJEXT) - -rm -f DiskIO/DiskDaemon/DiskdFile.$(OBJEXT) - -rm -f DiskIO/DiskDaemon/DiskdIOStrategy.$(OBJEXT) - -rm -f DiskIO/DiskDaemon/diskd.$(OBJEXT) - -rm -f DiskIO/DiskIOModule.$(OBJEXT) - -rm -f DiskIO/DiskIOModules_gen.$(OBJEXT) - -rm -f DiskIO/DiskThreads/CommIO.$(OBJEXT) - -rm -f DiskIO/DiskThreads/DiskThreadsDiskFile.$(OBJEXT) - -rm -f DiskIO/DiskThreads/DiskThreadsDiskIOModule.$(OBJEXT) - -rm -f DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT) - -rm -f DiskIO/DiskThreads/aiops.$(OBJEXT) - -rm -f DiskIO/DiskThreads/aiops_win32.$(OBJEXT) - -rm -f DiskIO/DiskThreads/async_io.$(OBJEXT) - -rm -f DiskIO/IpcIo/IpcIoDiskIOModule.$(OBJEXT) - -rm -f DiskIO/IpcIo/IpcIoFile.$(OBJEXT) - -rm -f DiskIO/IpcIo/IpcIoIOStrategy.$(OBJEXT) - -rm -f DiskIO/Mmapped/MmappedDiskIOModule.$(OBJEXT) - -rm -f DiskIO/Mmapped/MmappedFile.$(OBJEXT) - -rm -f DiskIO/Mmapped/MmappedIOStrategy.$(OBJEXT) - -rm -f DiskIO/ReadRequest.$(OBJEXT) - -rm -f DiskIO/WriteRequest.$(OBJEXT) - -rm -f tests/TestSwapDir.$(OBJEXT) - -rm -f tests/stub_DelayId.$(OBJEXT) - -rm -f tests/stub_DiskIOModule.$(OBJEXT) - -rm -f tests/stub_HelperChildConfig.$(OBJEXT) - -rm -f tests/stub_HttpReply.$(OBJEXT) - -rm -f tests/stub_HttpRequest.$(OBJEXT) - -rm -f tests/stub_MemBuf.$(OBJEXT) - -rm -f tests/stub_MemObject.$(OBJEXT) - -rm -f tests/stub_MemStore.$(OBJEXT) - -rm -f tests/stub_Port.$(OBJEXT) - -rm -f tests/stub_StatHist.$(OBJEXT) - -rm -f tests/stub_UdsOp.$(OBJEXT) - -rm -f tests/stub_access_log.$(OBJEXT) - -rm -f tests/stub_acl.$(OBJEXT) - -rm -f tests/stub_cache_cf.$(OBJEXT) - -rm -f tests/stub_cache_manager.$(OBJEXT) - -rm -f tests/stub_cbdata.$(OBJEXT) - -rm -f tests/stub_client_db.$(OBJEXT) - -rm -f tests/stub_client_side.$(OBJEXT) - -rm -f tests/stub_client_side_request.$(OBJEXT) - -rm -f tests/stub_comm.$(OBJEXT) - -rm -f tests/stub_debug.$(OBJEXT) - -rm -f tests/stub_errorpage.$(OBJEXT) - -rm -f tests/stub_event.$(OBJEXT) - -rm -f tests/stub_fatal.$(OBJEXT) - -rm -f tests/stub_fd.$(OBJEXT) - -rm -f tests/stub_helper.$(OBJEXT) - -rm -f tests/stub_http.$(OBJEXT) - -rm -f tests/stub_icp.$(OBJEXT) - -rm -f tests/stub_internal.$(OBJEXT) - -rm -f tests/stub_ipc.$(OBJEXT) - -rm -f tests/stub_ipc_Forwarder.$(OBJEXT) - -rm -f tests/stub_ipc_TypedMsgHdr.$(OBJEXT) - -rm -f tests/stub_ipcache.$(OBJEXT) - -rm -f tests/stub_libcomm.$(OBJEXT) - -rm -f tests/stub_libeui.$(OBJEXT) - -rm -f tests/stub_libformat.$(OBJEXT) - -rm -f tests/stub_libicmp.$(OBJEXT) - -rm -f tests/stub_libmgr.$(OBJEXT) - -rm -f tests/stub_libsslsquid.$(OBJEXT) - -rm -f tests/stub_main_cc.$(OBJEXT) - -rm -f tests/stub_mem.$(OBJEXT) - -rm -f tests/stub_mime.$(OBJEXT) - -rm -f tests/stub_pconn.$(OBJEXT) - -rm -f tests/stub_stmem.$(OBJEXT) - -rm -f tests/stub_store.$(OBJEXT) - -rm -f tests/stub_store_client.$(OBJEXT) - -rm -f tests/stub_store_rebuild.$(OBJEXT) - -rm -f tests/stub_store_stats.$(OBJEXT) - -rm -f tests/stub_store_swapout.$(OBJEXT) - -rm -f tests/stub_tools.$(OBJEXT) - -rm -f tests/testACLMaxUserIP.$(OBJEXT) - -rm -f tests/testBoilerplate.$(OBJEXT) - -rm -f tests/testCacheManager.$(OBJEXT) - -rm -f tests/testConfigParser.$(OBJEXT) - -rm -f tests/testCoss.$(OBJEXT) - -rm -f tests/testDiskIO.$(OBJEXT) - -rm -f tests/testEvent.$(OBJEXT) - -rm -f tests/testEventLoop.$(OBJEXT) - -rm -f tests/testHttpParser.$(OBJEXT) - -rm -f tests/testHttpReply.$(OBJEXT) - -rm -f tests/testHttpRequest.$(OBJEXT) - -rm -f tests/testHttpRequestMethod.$(OBJEXT) - -rm -f tests/testMain.$(OBJEXT) - -rm -f tests/testRefCount.$(OBJEXT) - -rm -f tests/testRock.$(OBJEXT) - -rm -f tests/testStatHist.$(OBJEXT) - -rm -f tests/testStore.$(OBJEXT) - -rm -f tests/testStoreController.$(OBJEXT) - -rm -f tests/testStoreEntryStream.$(OBJEXT) - -rm -f tests/testStoreHashIndex.$(OBJEXT) - -rm -f tests/testStoreSupport.$(OBJEXT) - -rm -f tests/testString.$(OBJEXT) - -rm -f tests/testURL.$(OBJEXT) - -rm -f tests/testURLScheme.$(OBJEXT) - -rm -f tests/testUfs.$(OBJEXT) - -rm -f tests/testVector.$(OBJEXT) - -rm -f tests/test_http_range.$(OBJEXT) + -rm -f DiskIO/*.$(OBJEXT) + -rm -f DiskIO/AIO/*.$(OBJEXT) + -rm -f DiskIO/Blocking/*.$(OBJEXT) + -rm -f DiskIO/DiskDaemon/*.$(OBJEXT) + -rm -f DiskIO/DiskThreads/*.$(OBJEXT) + -rm -f DiskIO/IpcIo/*.$(OBJEXT) + -rm -f DiskIO/Mmapped/*.$(OBJEXT) + -rm -f tests/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -6684,28 +6965,28 @@ @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test_http_range.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -6716,11 +6997,18 @@ -rm -rf tests/.libs tests/_libs install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -6749,13 +7037,14 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) - test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" @list='$(data_DATA)'; test -n "$(datadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -6769,13 +7058,14 @@ @$(NORMAL_UNINSTALL) @list='$(data_DATA)'; test -n "$(datadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(datadir)" && rm -f $$files + dir='$(DESTDIR)$(datadir)'; $(am__uninstall_files_from_dir) install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -6789,27 +7079,28 @@ @$(NORMAL_UNINSTALL) @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -6824,57 +7115,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -6890,12 +7136,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -6907,15 +7148,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -6924,116 +7161,322 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +tests/testACLMaxUserIP.log: tests/testACLMaxUserIP$(EXEEXT) + @p='tests/testACLMaxUserIP$(EXEEXT)'; \ + b='tests/testACLMaxUserIP'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testBoilerplate.log: tests/testBoilerplate$(EXEEXT) + @p='tests/testBoilerplate$(EXEEXT)'; \ + b='tests/testBoilerplate'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testCacheManager.log: tests/testCacheManager$(EXEEXT) + @p='tests/testCacheManager$(EXEEXT)'; \ + b='tests/testCacheManager'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testDiskIO.log: tests/testDiskIO$(EXEEXT) + @p='tests/testDiskIO$(EXEEXT)'; \ + b='tests/testDiskIO'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testEvent.log: tests/testEvent$(EXEEXT) + @p='tests/testEvent$(EXEEXT)'; \ + b='tests/testEvent'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testEventLoop.log: tests/testEventLoop$(EXEEXT) + @p='tests/testEventLoop$(EXEEXT)'; \ + b='tests/testEventLoop'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/test_http_range.log: tests/test_http_range$(EXEEXT) + @p='tests/test_http_range$(EXEEXT)'; \ + b='tests/test_http_range'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testHttpParser.log: tests/testHttpParser$(EXEEXT) + @p='tests/testHttpParser$(EXEEXT)'; \ + b='tests/testHttpParser'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testHttpReply.log: tests/testHttpReply$(EXEEXT) + @p='tests/testHttpReply$(EXEEXT)'; \ + b='tests/testHttpReply'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testHttpRequest.log: tests/testHttpRequest$(EXEEXT) + @p='tests/testHttpRequest$(EXEEXT)'; \ + b='tests/testHttpRequest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testStore.log: tests/testStore$(EXEEXT) + @p='tests/testStore$(EXEEXT)'; \ + b='tests/testStore'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testString.log: tests/testString$(EXEEXT) + @p='tests/testString$(EXEEXT)'; \ + b='tests/testString'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testURL.log: tests/testURL$(EXEEXT) + @p='tests/testURL$(EXEEXT)'; \ + b='tests/testURL'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testConfigParser.log: tests/testConfigParser$(EXEEXT) + @p='tests/testConfigParser$(EXEEXT)'; \ + b='tests/testConfigParser'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testStatHist.log: tests/testStatHist$(EXEEXT) + @p='tests/testStatHist$(EXEEXT)'; \ + b='tests/testStatHist'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testVector.log: tests/testVector$(EXEEXT) + @p='tests/testVector$(EXEEXT)'; \ + b='tests/testVector'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testRock.log: tests/testRock$(EXEEXT) + @p='tests/testRock$(EXEEXT)'; \ + b='tests/testRock'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/testUfs.log: tests/testUfs$(EXEEXT) + @p='tests/testUfs$(EXEEXT)'; \ + b='tests/testUfs'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testRefCount.log: testRefCount$(EXEEXT) + @p='testRefCount$(EXEEXT)'; \ + b='testRefCount'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -7065,13 +7508,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -7114,11 +7554,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -7225,16 +7673,15 @@ uninstall-man: uninstall-man8 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - check-am ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check check-am install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-binPROGRAMS \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS clean-sbinPROGRAMS ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ + clean-noinstPROGRAMS clean-sbinPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-local \ @@ -7246,7 +7693,7 @@ install-sysconfDATA installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-dataDATA uninstall-libexecPROGRAMS uninstall-local \ uninstall-man uninstall-man8 uninstall-sbinPROGRAMS \ diff -u -r -N squid-3.4.4/src/MemBuf.cc squid-3.4.4.1/src/MemBuf.cc --- squid-3.4.4/src/MemBuf.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/MemBuf.cc 2014-04-23 05:50:18.000000000 -0700 @@ -137,6 +137,7 @@ capacity = 0; stolen = 0; grow(szInit); + terminate(); } /** diff -u -r -N squid-3.4.4/src/mgr/Forwarder.cc squid-3.4.4.1/src/mgr/Forwarder.cc --- squid-3.4.4/src/mgr/Forwarder.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/mgr/Forwarder.cc 2014-04-23 05:50:18.000000000 -0700 @@ -69,7 +69,7 @@ Mgr::Forwarder::handleError() { debugs(16, DBG_CRITICAL, "ERROR: uri " << entry->url() << " exceeds buffer size"); - sendError(new ErrorState(ERR_INVALID_URL, Http::scRequestUriTooLarge, httpRequest)); + sendError(new ErrorState(ERR_INVALID_URL, Http::scUriTooLong, httpRequest)); mustStop("long URI"); } diff -u -r -N squid-3.4.4/src/mgr/InfoAction.cc squid-3.4.4.1/src/mgr/InfoAction.cc --- squid-3.4.4/src/mgr/InfoAction.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/mgr/InfoAction.cc 2014-04-23 05:50:18.000000000 -0700 @@ -81,9 +81,6 @@ cpu_usage += stats.cpu_usage; cpu_usage5 += stats.cpu_usage5; cpu_usage60 += stats.cpu_usage60; -#if HAVE_SBRK - proc_data_seg += stats.proc_data_seg; -#endif maxrss += stats.maxrss; page_faults += stats.page_faults; #if HAVE_MSTATS && HAVE_GNUMALLOC_H @@ -106,8 +103,8 @@ mp_uordbytes += stats.mp_uordbytes; mp_allocated += stats.mp_allocated; mp_treeoverhead += stats.mp_treeoverhead; -#endif -#endif +#endif /* HAVE_STRUCT_MALLINFO_MXFAST */ +#endif /* HAVE_MALLINFO && HAVE_STRUCT_MALLINFO */ total_accounted += stats.total_accounted; #if !(HAVE_MSTATS && HAVE_GNUMALLOC_H) && HAVE_MALLINFO && HAVE_STRUCT_MALLINFO mem_pool_allocated += stats.mem_pool_allocated; diff -u -r -N squid-3.4.4/src/mgr/InfoAction.h squid-3.4.4.1/src/mgr/InfoAction.h --- squid-3.4.4/src/mgr/InfoAction.h 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/mgr/InfoAction.h 2014-04-23 05:50:18.000000000 -0700 @@ -68,9 +68,6 @@ double cpu_usage; double cpu_usage5; double cpu_usage60; -#if HAVE_SBRK - double proc_data_seg; -#endif double maxrss; double page_faults; #if HAVE_MSTATS && HAVE_GNUMALLOC_H @@ -93,8 +90,8 @@ double mp_uordbytes; double mp_allocated; double mp_treeoverhead; -#endif -#endif +#endif /* HAVE_STRUCT_MALLINFO_MXFAST */ +#endif /* HAVE_MALLINFO && HAVE_STRUCT_MALLINFO */ double total_accounted; #if !(HAVE_MSTATS && HAVE_GNUMALLOC_H) && HAVE_MALLINFO && HAVE_STRUCT_MALLINFO double mem_pool_allocated; diff -u -r -N squid-3.4.4/src/mgr/Makefile.in squid-3.4.4.1/src/mgr/Makefile.in --- squid-3.4.4/src/mgr/Makefile.in 2014-03-09 01:41:56.000000000 -0800 +++ squid-3.4.4.1/src/mgr/Makefile.in 2014-04-23 05:51:36.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/mgr @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -111,39 +157,298 @@ Response.lo ServiceTimesAction.lo StoreIoAction.lo \ StoreToCommWriter.lo QueryParams.lo IntParam.lo StringParam.lo libmgr_la_OBJECTS = $(am_libmgr_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmgr_la_SOURCES) DIST_SOURCES = $(libmgr_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -182,6 +487,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -199,6 +505,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -236,11 +543,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -299,6 +608,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -420,7 +730,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -442,6 +752,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -454,14 +765,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libmgr.la: $(libmgr_la_OBJECTS) $(libmgr_la_DEPENDENCIES) - $(CXXLINK) $(libmgr_la_OBJECTS) $(libmgr_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmgr.la: $(libmgr_la_OBJECTS) $(libmgr_la_DEPENDENCIES) $(EXTRA_libmgr_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libmgr_la_OBJECTS) $(libmgr_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -503,25 +817,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringParam.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -529,26 +843,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +863,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,101 +876,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -719,11 +1104,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -808,19 +1201,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/peer_digest.cc squid-3.4.4.1/src/peer_digest.cc --- squid-3.4.4/src/peer_digest.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/peer_digest.cc 2014-04-23 05:50:18.000000000 -0700 @@ -314,8 +314,7 @@ if (p->digest_url) url = xstrdup(p->digest_url); else - url = internalRemoteUri(p->host, p->http_port, - "/squid-internal-periodic/", StoreDigestFileName); + url = xstrdup(internalRemoteUri(p->host, p->http_port, "/squid-internal-periodic/", StoreDigestFileName)); req = HttpRequest::CreateFromUrl(url); diff -u -r -N squid-3.4.4/src/peer_select.cc squid-3.4.4.1/src/peer_select.cc --- squid-3.4.4/src/peer_select.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/peer_select.cc 2014-04-23 05:50:18.000000000 -0700 @@ -242,7 +242,7 @@ // construct a "result" adding the ORIGINAL_DST to the set instead of DIRECT Comm::ConnectionPointer p = new Comm::Connection(); p->remote = req->clientConnectionManager->clientConnection->local; - p->peerType = fs->code; + p->peerType = ORIGINAL_DST; // fs->code is DIRECT. This fixes the display. p->setPeer(fs->_peer); // check for a configured outgoing address for this destination... diff -u -r -N squid-3.4.4/src/redirect.cc squid-3.4.4.1/src/redirect.cc --- squid-3.4.4/src/redirect.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/redirect.cc 2014-04-23 05:50:18.000000000 -0700 @@ -124,7 +124,7 @@ newReply.notes.append(&reply.notes); if (status == Http::scMovedPermanently - || status == Http::scMovedTemporarily + || status == Http::scFound || status == Http::scSeeOther || status == Http::scPermanentRedirect || status == Http::scTemporaryRedirect) { @@ -289,7 +289,7 @@ status = Http::scInternalServerError; debugs(61, DBG_CRITICAL, "ERROR: Gateway Failure. Can not build request to be passed to " << name << ". Request ABORTED."); } else { - status = Http::scRequestUriTooLarge; + status = Http::scUriTooLong; debugs(61, DBG_CRITICAL, "ERROR: Gateway Failure. Request passed to " << name << " exceeds MAX_REDIRECTOR_REQUEST_STRLEN (" << MAX_REDIRECTOR_REQUEST_STRLEN << "). Request ABORTED."); } diff -u -r -N squid-3.4.4/src/repl/Makefile.in squid-3.4.4.1/src/repl/Makefile.in --- squid-3.4.4/src/repl/Makefile.in 2014-03-09 01:41:57.000000000 -0800 +++ squid-3.4.4.1/src/repl/Makefile.in 2014-04-23 05:51:36.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,51 @@ # Makefile for storage modules in the Squid Object Cache server VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,8 +80,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/repl @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -106,6 +151,10 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libheap_a_AR = $(AR) $(ARFLAGS) libheap_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -116,39 +165,298 @@ liblru_a_LIBADD = am_liblru_a_OBJECTS = lru/store_repl_lru.$(OBJEXT) liblru_a_OBJECTS = $(am_liblru_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libheap_a_SOURCES) $(liblru_a_SOURCES) DIST_SOURCES = $(libheap_a_SOURCES) $(liblru_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -187,6 +495,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -204,6 +513,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -241,11 +551,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -304,6 +616,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -379,7 +692,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -401,6 +714,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -423,10 +737,11 @@ heap/$(DEPDIR)/$(am__dirstamp) heap/store_repl_heap.$(OBJEXT): heap/$(am__dirstamp) \ heap/$(DEPDIR)/$(am__dirstamp) -libheap.a: $(libheap_a_OBJECTS) $(libheap_a_DEPENDENCIES) - -rm -f libheap.a - $(libheap_a_AR) libheap.a $(libheap_a_OBJECTS) $(libheap_a_LIBADD) - $(RANLIB) libheap.a + +libheap.a: $(libheap_a_OBJECTS) $(libheap_a_DEPENDENCIES) $(EXTRA_libheap_a_DEPENDENCIES) + $(AM_V_at)-rm -f libheap.a + $(AM_V_AR)$(libheap_a_AR) libheap.a $(libheap_a_OBJECTS) $(libheap_a_LIBADD) + $(AM_V_at)$(RANLIB) libheap.a lru/$(am__dirstamp): @$(MKDIR_P) lru @: > lru/$(am__dirstamp) @@ -435,10 +750,11 @@ @: > lru/$(DEPDIR)/$(am__dirstamp) lru/store_repl_lru.$(OBJEXT): lru/$(am__dirstamp) \ lru/$(DEPDIR)/$(am__dirstamp) -liblru.a: $(liblru_a_OBJECTS) $(liblru_a_DEPENDENCIES) - -rm -f liblru.a - $(liblru_a_AR) liblru.a $(liblru_a_OBJECTS) $(liblru_a_LIBADD) - $(RANLIB) liblru.a + +liblru.a: $(liblru_a_OBJECTS) $(liblru_a_DEPENDENCIES) $(EXTRA_liblru_a_DEPENDENCIES) + $(AM_V_at)-rm -f liblru.a + $(AM_V_AR)$(liblru_a_AR) liblru.a $(liblru_a_OBJECTS) $(liblru_a_LIBADD) + $(AM_V_at)$(RANLIB) liblru.a clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -451,9 +767,8 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f heap/store_heap_replacement.$(OBJEXT) - -rm -f heap/store_repl_heap.$(OBJEXT) - -rm -f lru/store_repl_lru.$(OBJEXT) + -rm -f heap/*.$(OBJEXT) + -rm -f lru/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -463,28 +778,28 @@ @AMDEP_TRUE@@am__include@ @am__quote@lru/$(DEPDIR)/store_repl_lru.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -492,26 +807,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -523,15 +827,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -540,101 +840,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -682,11 +1068,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -775,19 +1169,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/snmp/Makefile.in squid-3.4.4.1/src/snmp/Makefile.in --- squid-3.4.4/src/snmp/Makefile.in 2014-03-09 01:41:57.000000000 -0800 +++ squid-3.4.4.1/src/snmp/Makefile.in 2014-04-23 05:51:37.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/snmp @@ -47,7 +93,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -107,39 +153,298 @@ am_libsnmp_la_OBJECTS = Forwarder.lo Inquirer.lo Pdu.lo Request.lo \ Response.lo Session.lo Var.lo libsnmp_la_OBJECTS = $(am_libsnmp_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsnmp_la_SOURCES) DIST_SOURCES = $(libsnmp_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -178,6 +483,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -195,6 +501,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -232,11 +539,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -295,6 +604,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -381,7 +691,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -403,6 +713,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -415,14 +726,17 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsnmp.la: $(libsnmp_la_OBJECTS) $(libsnmp_la_DEPENDENCIES) - $(CXXLINK) $(libsnmp_la_OBJECTS) $(libsnmp_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsnmp.la: $(libsnmp_la_OBJECTS) $(libsnmp_la_DEPENDENCIES) $(EXTRA_libsnmp_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libsnmp_la_OBJECTS) $(libsnmp_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -448,25 +762,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Var.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -474,26 +788,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -505,15 +808,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -522,101 +821,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -664,11 +1049,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -753,19 +1146,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/ssl/Makefile.in squid-3.4.4.1/src/ssl/Makefile.in --- squid-3.4.4/src/ssl/Makefile.in 2014-03-09 01:41:57.000000000 -0800 +++ squid-3.4.4.1/src/ssl/Makefile.in 2014-04-23 05:51:37.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) EXTRA_PROGRAMS = ssl_crtd$(EXEEXT) @@ -50,7 +96,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -111,6 +157,10 @@ context_storage.lo Config.lo ErrorDetail.lo \ ErrorDetailManager.lo ServerBump.lo support.lo helper.lo libsslsquid_la_OBJECTS = $(am_libsslsquid_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libsslutil_la_LIBADD = am_libsslutil_la_OBJECTS = gadgets.lo crtd_message.lo libsslutil_la_OBJECTS = $(am_libsslutil_la_OBJECTS) @@ -128,41 +178,296 @@ $(am__DEPENDENCIES_2) @USE_SSL_CRTD_TRUE@ssl_crtd_DEPENDENCIES = libsslutil.la \ @USE_SSL_CRTD_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsslsquid_la_SOURCES) $(libsslutil_la_SOURCES) \ $(ssl_crtd_SOURCES) DIST_SOURCES = $(libsslsquid_la_SOURCES) $(libsslutil_la_SOURCES) \ $(am__ssl_crtd_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -201,6 +506,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -218,6 +524,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -255,11 +562,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -318,6 +627,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -419,7 +729,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -441,6 +751,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -453,16 +764,20 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsslsquid.la: $(libsslsquid_la_OBJECTS) $(libsslsquid_la_DEPENDENCIES) - $(CXXLINK) $(libsslsquid_la_OBJECTS) $(libsslsquid_la_LIBADD) $(LIBS) -libsslutil.la: $(libsslutil_la_OBJECTS) $(libsslutil_la_DEPENDENCIES) - $(CXXLINK) $(libsslutil_la_OBJECTS) $(libsslutil_la_LIBADD) $(LIBS) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsslsquid.la: $(libsslsquid_la_OBJECTS) $(libsslsquid_la_DEPENDENCIES) $(EXTRA_libsslsquid_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libsslsquid_la_OBJECTS) $(libsslsquid_la_LIBADD) $(LIBS) + +libsslutil.la: $(libsslutil_la_OBJECTS) $(libsslutil_la_DEPENDENCIES) $(EXTRA_libsslutil_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(libsslutil_la_OBJECTS) $(libsslutil_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -474,14 +789,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -502,7 +822,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -515,9 +836,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ssl_crtd$(EXEEXT): $(ssl_crtd_OBJECTS) $(ssl_crtd_DEPENDENCIES) + +ssl_crtd$(EXEEXT): $(ssl_crtd_OBJECTS) $(ssl_crtd_DEPENDENCIES) $(EXTRA_ssl_crtd_DEPENDENCIES) @rm -f ssl_crtd$(EXEEXT) - $(CXXLINK) $(ssl_crtd_OBJECTS) $(ssl_crtd_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(ssl_crtd_OBJECTS) $(ssl_crtd_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -539,25 +861,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -565,26 +887,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -596,15 +907,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -613,101 +920,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +testHeaders.log: testHeaders + @p='testHeaders'; \ + b='testHeaders'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -758,11 +1151,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -847,20 +1248,21 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-libexecPROGRAMS $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/src/stat.cc squid-3.4.4.1/src/stat.cc --- squid-3.4.4/src/stat.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/stat.cc 2014-04-23 05:50:18.000000000 -0700 @@ -591,12 +591,6 @@ stats.cpu_usage5 = statCPUUsage(5); stats.cpu_usage60 = statCPUUsage(60); -#if HAVE_SBRK - - stats.proc_data_seg = ((char *) sbrk(0) - (char *) sbrk_start); - -#endif - stats.maxrss = rusage_maxrss(&rusage); stats.page_faults = rusage_pagefaults(&rusage); @@ -815,13 +809,6 @@ storeAppendPrintf(sentry, "\tCPU Usage, 60 minute avg:\t%.2f%%\n", stats.cpu_usage60); -#if HAVE_SBRK - - storeAppendPrintf(sentry, "\tProcess Data Segment Size via sbrk(): %.0f KB\n", - stats.proc_data_seg / 1024); - -#endif - storeAppendPrintf(sentry, "\tMaximum Resident Size: %.0f KB\n", stats.maxrss); @@ -1462,18 +1449,12 @@ if (Config.warnings.high_memory) { size_t i = 0; #if HAVE_MSTATS && HAVE_GNUMALLOC_H - struct mstats ms = mstats(); i = ms.bytes_total; #elif HAVE_MALLINFO && HAVE_STRUCT_MALLINFO - struct mallinfo mp = mallinfo(); i = mp.arena; -#elif HAVE_SBRK - - i = (size_t) ((char *) sbrk(0) - (char *) sbrk_start); #endif - if (Config.warnings.high_memory < i) debugs(18, DBG_CRITICAL, "WARNING: Memory usage at " << ((unsigned long int)(i >> 20)) << " MB"); } diff -u -r -N squid-3.4.4/src/tunnel.cc squid-3.4.4.1/src/tunnel.cc --- squid-3.4.4/src/tunnel.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/tunnel.cc 2014-04-23 05:50:18.000000000 -0700 @@ -33,6 +33,7 @@ #include "squid.h" #include "acl/FilledChecklist.h" +#include "base/CbcPointer.h" #include "base/Vector.h" #include "CachePeer.h" #include "client_side_request.h" @@ -99,6 +100,7 @@ bool noConnections() const; char *url; + CbcPointer http; HttpRequest::Pointer request; AccessLogEntryPointer al; Comm::ConnectionList serverDestinations; @@ -225,6 +227,7 @@ TunnelStateData::TunnelStateData() : url(NULL), + http(), request(NULL), status_ptr(NULL), connectRespBuf(NULL), @@ -675,11 +678,27 @@ assert(!tunnelState->waitingForConnectExchange()); *tunnelState->status_ptr = Http::scOkay; if (cbdataReferenceValid(tunnelState)) { + + // Shovel any payload already pushed into reply buffer by the server response if (!tunnelState->server.len) tunnelState->copyRead(tunnelState->server, TunnelStateData::ReadServer); - else + else { + debugs(26, DBG_DATA, "Tunnel server PUSH Payload: \n" << Raw("", tunnelState->server.buf, tunnelState->server.len) << "\n----------"); tunnelState->copy(tunnelState->server.len, tunnelState->server, tunnelState->client, TunnelStateData::WriteClientDone); - tunnelState->copyRead(tunnelState->client, TunnelStateData::ReadClient); + } + + // Bug 3371: shovel any payload already pushed into ConnStateData by the client request + if (tunnelState->http.valid() && tunnelState->http->getConn() && !tunnelState->http->getConn()->in.notYetUsed) { + struct ConnStateData::In *in = &tunnelState->http->getConn()->in; + debugs(26, DBG_DATA, "Tunnel client PUSH Payload: \n" << Raw("", in->buf, in->notYetUsed) << "\n----------"); + + // We just need to ensure the bytes from ConnStateData are in client.buf already to deliver + memcpy(tunnelState->client.buf, in->buf, in->notYetUsed); + // NP: readClient() takes care of buffer length accounting. + tunnelState->readClient(tunnelState->client.buf, in->notYetUsed, COMM_OK, 0); + in->notYetUsed = 0; // ConnStateData buffer accounting after the shuffle. + } else + tunnelState->copyRead(tunnelState->client, TunnelStateData::ReadClient); } } @@ -891,6 +910,7 @@ tunnelState->server.size_ptr = size_ptr; tunnelState->status_ptr = status_ptr; tunnelState->client.conn = http->getConn()->clientConnection; + tunnelState->http = http; tunnelState->al = al; comm_add_close_handler(tunnelState->client.conn->fd, @@ -932,6 +952,9 @@ packerClean(&p); mb.append("\r\n", 2); + debugs(11, 2, "Tunnel Server REQUEST: " << tunnelState->server.conn << ":\n----------\n" << + Raw("tunnelRelayConnectRequest", mb.content(), mb.contentSize()) << "\n----------"); + if (tunnelState->clientExpectsConnectResponse()) { // hack: blindly tunnel peer response (to our CONNECT request) to the client as ours. AsyncCall::Pointer writeCall = commCbCall(5,5, "tunnelConnectedWriteDone", diff -u -r -N squid-3.4.4/src/urn.cc squid-3.4.4.1/src/urn.cc --- squid-3.4.4/src/urn.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/urn.cc 2014-04-23 05:50:18.000000000 -0700 @@ -419,7 +419,7 @@ "\n", APP_FULLNAME, getMyHostname()); rep = new HttpReply; - rep->setHeaders(Http::scMovedTemporarily, NULL, "text/html", mb->contentSize(), 0, squid_curtime); + rep->setHeaders(Http::scFound, NULL, "text/html", mb->contentSize(), 0, squid_curtime); if (urnState->flags.force_menu) { debugs(51, 3, "urnHandleReply: forcing menu"); diff -u -r -N squid-3.4.4/src/wccp2.cc squid-3.4.4.1/src/wccp2.cc --- squid-3.4.4/src/wccp2.cc 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/src/wccp2.cc 2014-04-23 05:50:18.000000000 -0700 @@ -66,7 +66,7 @@ #define WCCP2_MASK_ASSIGNMENT 0x01 #define WCCP2_NONE_SECURITY_LEN 0 -#define WCCP2_MD5_SECURITY_LEN 16 +#define WCCP2_MD5_SECURITY_LEN SQUID_MD5_DIGEST_LENGTH // 16 /* Useful defines */ #define WCCP2_NUMPORTS 8 @@ -572,7 +572,7 @@ static char wccp2_update_md5_security(char *password, char *ptr, char *packet, int len) { - uint8_t md5_digest[16]; + uint8_t md5Digest[SQUID_MD5_DIGEST_LENGTH]; char pwd[WCCP2_PASSWORD_LEN]; SquidMD5_CTX M; @@ -600,7 +600,7 @@ * including the WCCP message header. The WCCP security implementation * area should be zero'ed before calculating the MD5 hash. */ - /* XXX eventually we should be able to kill md5_digest and blit it directly in */ + /* XXX eventually we should be able to kill md5Digest and blit it directly in */ memset(ws->security_implementation, 0, sizeof(ws->security_implementation)); SquidMD5Init(&M); @@ -609,9 +609,9 @@ SquidMD5Update(&M, packet, len); - SquidMD5Final(md5_digest, &M); + SquidMD5Final(md5Digest, &M); - memcpy(ws->security_implementation, md5_digest, sizeof(md5_digest)); + memcpy(ws->security_implementation, md5Digest, sizeof(md5Digest)); /* Finished! */ return 1; @@ -626,7 +626,7 @@ { struct wccp2_security_md5_t *ws = (struct wccp2_security_md5_t *) security; - uint8_t md5_digest[16], md5_challenge[16]; + uint8_t md5Digest[SQUID_MD5_DIGEST_LENGTH], md5_challenge[SQUID_MD5_DIGEST_LENGTH]; char pwd[WCCP2_PASSWORD_LEN]; SquidMD5_CTX M; @@ -654,7 +654,7 @@ pwd[sizeof(pwd) - 1] = '\0'; /* Take a copy of the challenge: we need to NUL it before comparing */ - memcpy(md5_challenge, ws->security_implementation, 16); + memcpy(md5_challenge, ws->security_implementation, sizeof(md5_challenge)); memset(ws->security_implementation, 0, sizeof(ws->security_implementation)); @@ -664,9 +664,9 @@ SquidMD5Update(&M, packet, len); - SquidMD5Final(md5_digest, &M); + SquidMD5Final(md5Digest, &M); - return (memcmp(md5_digest, md5_challenge, 16) == 0); + return (memcmp(md5Digest, md5_challenge, SQUID_MD5_DIGEST_LENGTH) == 0); } void diff -u -r -N squid-3.4.4/test-suite/Makefile.in squid-3.4.4.1/test-suite/Makefile.in --- squid-3.4.4/test-suite/Makefile.in 2014-03-09 01:41:57.000000000 -0800 +++ squid-3.4.4.1/test-suite/Makefile.in 2014-04-23 05:51:38.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,8 +77,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = debug$(EXEEXT) $(am__EXEEXT_2) MemPoolTest$(EXEEXT) \ mem_node_test$(EXEEXT) mem_hdr_test$(EXEEXT) splay$(EXEEXT) \ StackTest$(EXEEXT) syntheticoperators$(EXEEXT) \ @@ -55,7 +100,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -125,6 +170,10 @@ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) ESIExpressions_DEPENDENCIES = $(top_builddir)/src/esi/Expression.o \ $(am__DEPENDENCIES_4) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_MemPoolTest_OBJECTS = MemPoolTest.$(OBJEXT) MemPoolTest_OBJECTS = $(am_MemPoolTest_OBJECTS) MemPoolTest_LDADD = $(LDADD) @@ -180,28 +229,58 @@ tcp_banger2_SOURCES = tcp-banger2.c tcp_banger2_OBJECTS = tcp-banger2.$(OBJEXT) tcp_banger2_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(ESIExpressions_SOURCES) $(MemPoolTest_SOURCES) \ $(StackTest_SOURCES) $(VirtualDeleteOperator_SOURCES) \ $(debug_SOURCES) $(mem_hdr_test_SOURCES) \ @@ -212,15 +291,240 @@ $(debug_SOURCES) $(mem_hdr_test_SOURCES) \ $(mem_node_test_SOURCES) membanger.c $(splay_SOURCES) \ $(syntheticoperators_SOURCES) tcp-banger2.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -259,6 +563,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -276,6 +581,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -313,11 +619,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -376,6 +684,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -477,7 +786,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .cc .lo .o .obj +.SUFFIXES: .c .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -499,6 +808,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -517,39 +827,50 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ESIExpressions$(EXEEXT): $(ESIExpressions_OBJECTS) $(ESIExpressions_DEPENDENCIES) + +ESIExpressions$(EXEEXT): $(ESIExpressions_OBJECTS) $(ESIExpressions_DEPENDENCIES) $(EXTRA_ESIExpressions_DEPENDENCIES) @rm -f ESIExpressions$(EXEEXT) - $(CXXLINK) $(ESIExpressions_OBJECTS) $(ESIExpressions_LDADD) $(LIBS) -MemPoolTest$(EXEEXT): $(MemPoolTest_OBJECTS) $(MemPoolTest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(ESIExpressions_OBJECTS) $(ESIExpressions_LDADD) $(LIBS) + +MemPoolTest$(EXEEXT): $(MemPoolTest_OBJECTS) $(MemPoolTest_DEPENDENCIES) $(EXTRA_MemPoolTest_DEPENDENCIES) @rm -f MemPoolTest$(EXEEXT) - $(CXXLINK) $(MemPoolTest_OBJECTS) $(MemPoolTest_LDADD) $(LIBS) -StackTest$(EXEEXT): $(StackTest_OBJECTS) $(StackTest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(MemPoolTest_OBJECTS) $(MemPoolTest_LDADD) $(LIBS) + +StackTest$(EXEEXT): $(StackTest_OBJECTS) $(StackTest_DEPENDENCIES) $(EXTRA_StackTest_DEPENDENCIES) @rm -f StackTest$(EXEEXT) - $(CXXLINK) $(StackTest_OBJECTS) $(StackTest_LDADD) $(LIBS) -VirtualDeleteOperator$(EXEEXT): $(VirtualDeleteOperator_OBJECTS) $(VirtualDeleteOperator_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(StackTest_OBJECTS) $(StackTest_LDADD) $(LIBS) + +VirtualDeleteOperator$(EXEEXT): $(VirtualDeleteOperator_OBJECTS) $(VirtualDeleteOperator_DEPENDENCIES) $(EXTRA_VirtualDeleteOperator_DEPENDENCIES) @rm -f VirtualDeleteOperator$(EXEEXT) - $(CXXLINK) $(VirtualDeleteOperator_OBJECTS) $(VirtualDeleteOperator_LDADD) $(LIBS) -debug$(EXEEXT): $(debug_OBJECTS) $(debug_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(VirtualDeleteOperator_OBJECTS) $(VirtualDeleteOperator_LDADD) $(LIBS) + +debug$(EXEEXT): $(debug_OBJECTS) $(debug_DEPENDENCIES) $(EXTRA_debug_DEPENDENCIES) @rm -f debug$(EXEEXT) - $(CXXLINK) $(debug_OBJECTS) $(debug_LDADD) $(LIBS) -mem_hdr_test$(EXEEXT): $(mem_hdr_test_OBJECTS) $(mem_hdr_test_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(debug_OBJECTS) $(debug_LDADD) $(LIBS) + +mem_hdr_test$(EXEEXT): $(mem_hdr_test_OBJECTS) $(mem_hdr_test_DEPENDENCIES) $(EXTRA_mem_hdr_test_DEPENDENCIES) @rm -f mem_hdr_test$(EXEEXT) - $(CXXLINK) $(mem_hdr_test_OBJECTS) $(mem_hdr_test_LDADD) $(LIBS) -mem_node_test$(EXEEXT): $(mem_node_test_OBJECTS) $(mem_node_test_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mem_hdr_test_OBJECTS) $(mem_hdr_test_LDADD) $(LIBS) + +mem_node_test$(EXEEXT): $(mem_node_test_OBJECTS) $(mem_node_test_DEPENDENCIES) $(EXTRA_mem_node_test_DEPENDENCIES) @rm -f mem_node_test$(EXEEXT) - $(CXXLINK) $(mem_node_test_OBJECTS) $(mem_node_test_LDADD) $(LIBS) -membanger$(EXEEXT): $(membanger_OBJECTS) $(membanger_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mem_node_test_OBJECTS) $(mem_node_test_LDADD) $(LIBS) + +membanger$(EXEEXT): $(membanger_OBJECTS) $(membanger_DEPENDENCIES) $(EXTRA_membanger_DEPENDENCIES) @rm -f membanger$(EXEEXT) - $(LINK) $(membanger_OBJECTS) $(membanger_LDADD) $(LIBS) -splay$(EXEEXT): $(splay_OBJECTS) $(splay_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(membanger_OBJECTS) $(membanger_LDADD) $(LIBS) + +splay$(EXEEXT): $(splay_OBJECTS) $(splay_DEPENDENCIES) $(EXTRA_splay_DEPENDENCIES) @rm -f splay$(EXEEXT) - $(CXXLINK) $(splay_OBJECTS) $(splay_LDADD) $(LIBS) -syntheticoperators$(EXEEXT): $(syntheticoperators_OBJECTS) $(syntheticoperators_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(splay_OBJECTS) $(splay_LDADD) $(LIBS) + +syntheticoperators$(EXEEXT): $(syntheticoperators_OBJECTS) $(syntheticoperators_DEPENDENCIES) $(EXTRA_syntheticoperators_DEPENDENCIES) @rm -f syntheticoperators$(EXEEXT) - $(CXXLINK) $(syntheticoperators_OBJECTS) $(syntheticoperators_LDADD) $(LIBS) -tcp-banger2$(EXEEXT): $(tcp_banger2_OBJECTS) $(tcp_banger2_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(syntheticoperators_OBJECTS) $(syntheticoperators_LDADD) $(LIBS) + +tcp-banger2$(EXEEXT): $(tcp_banger2_OBJECTS) $(tcp_banger2_DEPENDENCIES) $(EXTRA_tcp_banger2_DEPENDENCIES) @rm -f tcp-banger2$(EXEEXT) - $(LINK) $(tcp_banger2_OBJECTS) $(tcp_banger2_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tcp_banger2_OBJECTS) $(tcp_banger2_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -574,52 +895,52 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tools.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cc.o: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -627,26 +948,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -658,15 +968,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -675,101 +981,243 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +debug.log: debug$(EXEEXT) + @p='debug$(EXEEXT)'; \ + b='debug'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +syntheticoperators.log: syntheticoperators$(EXEEXT) + @p='syntheticoperators$(EXEEXT)'; \ + b='syntheticoperators'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +VirtualDeleteOperator.log: VirtualDeleteOperator$(EXEEXT) + @p='VirtualDeleteOperator$(EXEEXT)'; \ + b='VirtualDeleteOperator'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +StackTest.log: StackTest$(EXEEXT) + @p='StackTest$(EXEEXT)'; \ + b='StackTest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +splay.log: splay$(EXEEXT) + @p='splay$(EXEEXT)'; \ + b='splay'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +MemPoolTest.log: MemPoolTest$(EXEEXT) + @p='MemPoolTest$(EXEEXT)'; \ + b='MemPoolTest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +mem_node_test.log: mem_node_test$(EXEEXT) + @p='mem_node_test$(EXEEXT)'; \ + b='mem_node_test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +mem_hdr_test.log: mem_hdr_test$(EXEEXT) + @p='mem_hdr_test$(EXEEXT)'; \ + b='mem_hdr_test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +ESIExpressions.log: ESIExpressions$(EXEEXT) + @p='ESIExpressions$(EXEEXT)'; \ + b='ESIExpressions'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -817,11 +1265,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -906,9 +1362,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -918,7 +1374,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.4.4/tools/Makefile.am squid-3.4.4.1/tools/Makefile.am --- squid-3.4.4/tools/Makefile.am 2014-03-09 01:40:56.000000000 -0800 +++ squid-3.4.4.1/tools/Makefile.am 2014-04-23 05:50:18.000000000 -0700 @@ -21,6 +21,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) diff -u -r -N squid-3.4.4/tools/Makefile.in squid-3.4.4.1/tools/Makefile.in --- squid-3.4.4/tools/Makefile.in 2014-03-09 01:41:58.000000000 -0800 +++ squid-3.4.4.1/tools/Makefile.in 2014-04-23 05:51:38.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -23,6 +22,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,9 +85,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/doc/manuals/Substitute.am \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am \ + $(top_srcdir)/doc/manuals/Substitute.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -58,7 +103,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -130,9 +175,14 @@ cachemgr__CGIEXT__DEPENDENCIES = $(top_builddir)/src/ip/libip.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) -cachemgr__CGIEXT__LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +cachemgr__CGIEXT__LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ am_squidclient_OBJECTS = squidclient.$(OBJEXT) stub_debug.$(OBJEXT) \ @@ -142,7 +192,8 @@ squidclient_DEPENDENCIES = $(top_builddir)/src/ip/libip.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_3) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -164,42 +215,267 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(cachemgr__CGIEXT__SOURCES) $(squidclient_SOURCES) DIST_SOURCES = $(cachemgr__CGIEXT__SOURCES) $(squidclient_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man1dir = $(mandir)/man1 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -231,6 +507,7 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -269,6 +546,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -286,6 +564,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -323,11 +602,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -386,6 +667,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -462,6 +744,7 @@ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ $(COMPAT_LIB) \ + $(NETTLELIB) \ $(KRB5LIBS) \ $(XTRA_LIBS) @@ -494,7 +777,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -516,6 +799,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -527,14 +811,19 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -555,7 +844,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -579,14 +869,19 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -607,7 +902,8 @@ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -620,16 +916,21 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -cachemgr$(CGIEXT)$(EXEEXT): $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__DEPENDENCIES) + +cachemgr$(CGIEXT)$(EXEEXT): $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__DEPENDENCIES) $(EXTRA_cachemgr__CGIEXT__DEPENDENCIES) @rm -f cachemgr$(CGIEXT)$(EXEEXT) - $(cachemgr__CGIEXT__LINK) $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__LDADD) $(LIBS) -squidclient$(EXEEXT): $(squidclient_OBJECTS) $(squidclient_DEPENDENCIES) + $(AM_V_CXXLD)$(cachemgr__CGIEXT__LINK) $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__LDADD) $(LIBS) + +squidclient$(EXEEXT): $(squidclient_OBJECTS) $(squidclient_DEPENDENCIES) $(EXTRA_squidclient_DEPENDENCIES) @rm -f squidclient$(EXEEXT) - $(CXXLINK) $(squidclient_OBJECTS) $(squidclient_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(squidclient_OBJECTS) $(squidclient_LDADD) $(LIBS) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -657,9 +958,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -677,84 +976,84 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo $(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` cachemgr__CGIEXT_-stub_debug.o: stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-stub_debug.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo -c -o cachemgr__CGIEXT_-stub_debug.o `test -f 'stub_debug.cc' || echo '$(srcdir)/'`stub_debug.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stub_debug.cc' object='cachemgr__CGIEXT_-stub_debug.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-stub_debug.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo -c -o cachemgr__CGIEXT_-stub_debug.o `test -f 'stub_debug.cc' || echo '$(srcdir)/'`stub_debug.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='stub_debug.cc' object='cachemgr__CGIEXT_-stub_debug.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-stub_debug.o `test -f 'stub_debug.cc' || echo '$(srcdir)/'`stub_debug.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-stub_debug.o `test -f 'stub_debug.cc' || echo '$(srcdir)/'`stub_debug.cc cachemgr__CGIEXT_-stub_debug.obj: stub_debug.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-stub_debug.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo -c -o cachemgr__CGIEXT_-stub_debug.obj `if test -f 'stub_debug.cc'; then $(CYGPATH_W) 'stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/stub_debug.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stub_debug.cc' object='cachemgr__CGIEXT_-stub_debug.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-stub_debug.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo -c -o cachemgr__CGIEXT_-stub_debug.obj `if test -f 'stub_debug.cc'; then $(CYGPATH_W) 'stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/stub_debug.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Tpo $(DEPDIR)/cachemgr__CGIEXT_-stub_debug.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='stub_debug.cc' object='cachemgr__CGIEXT_-stub_debug.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-stub_debug.obj `if test -f 'stub_debug.cc'; then $(CYGPATH_W) 'stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/stub_debug.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-stub_debug.obj `if test -f 'stub_debug.cc'; then $(CYGPATH_W) 'stub_debug.cc'; else $(CYGPATH_W) '$(srcdir)/stub_debug.cc'; fi` cachemgr__CGIEXT_-test_tools.o: test_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-test_tools.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo -c -o cachemgr__CGIEXT_-test_tools.o `test -f 'test_tools.cc' || echo '$(srcdir)/'`test_tools.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test_tools.cc' object='cachemgr__CGIEXT_-test_tools.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-test_tools.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo -c -o cachemgr__CGIEXT_-test_tools.o `test -f 'test_tools.cc' || echo '$(srcdir)/'`test_tools.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_tools.cc' object='cachemgr__CGIEXT_-test_tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-test_tools.o `test -f 'test_tools.cc' || echo '$(srcdir)/'`test_tools.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-test_tools.o `test -f 'test_tools.cc' || echo '$(srcdir)/'`test_tools.cc cachemgr__CGIEXT_-test_tools.obj: test_tools.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-test_tools.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo -c -o cachemgr__CGIEXT_-test_tools.obj `if test -f 'test_tools.cc'; then $(CYGPATH_W) 'test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/test_tools.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test_tools.cc' object='cachemgr__CGIEXT_-test_tools.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-test_tools.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo -c -o cachemgr__CGIEXT_-test_tools.obj `if test -f 'test_tools.cc'; then $(CYGPATH_W) 'test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/test_tools.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Tpo $(DEPDIR)/cachemgr__CGIEXT_-test_tools.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test_tools.cc' object='cachemgr__CGIEXT_-test_tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-test_tools.obj `if test -f 'test_tools.cc'; then $(CYGPATH_W) 'test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/test_tools.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-test_tools.obj `if test -f 'test_tools.cc'; then $(CYGPATH_W) 'test_tools.cc'; else $(CYGPATH_W) '$(srcdir)/test_tools.cc'; fi` cachemgr__CGIEXT_-time.o: time.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-time.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo -c -o cachemgr__CGIEXT_-time.o `test -f 'time.cc' || echo '$(srcdir)/'`time.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo $(DEPDIR)/cachemgr__CGIEXT_-time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='time.cc' object='cachemgr__CGIEXT_-time.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-time.o -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo -c -o cachemgr__CGIEXT_-time.o `test -f 'time.cc' || echo '$(srcdir)/'`time.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo $(DEPDIR)/cachemgr__CGIEXT_-time.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='time.cc' object='cachemgr__CGIEXT_-time.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-time.o `test -f 'time.cc' || echo '$(srcdir)/'`time.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-time.o `test -f 'time.cc' || echo '$(srcdir)/'`time.cc cachemgr__CGIEXT_-time.obj: time.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-time.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo -c -o cachemgr__CGIEXT_-time.obj `if test -f 'time.cc'; then $(CYGPATH_W) 'time.cc'; else $(CYGPATH_W) '$(srcdir)/time.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo $(DEPDIR)/cachemgr__CGIEXT_-time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='time.cc' object='cachemgr__CGIEXT_-time.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-time.obj -MD -MP -MF $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo -c -o cachemgr__CGIEXT_-time.obj `if test -f 'time.cc'; then $(CYGPATH_W) 'time.cc'; else $(CYGPATH_W) '$(srcdir)/time.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cachemgr__CGIEXT_-time.Tpo $(DEPDIR)/cachemgr__CGIEXT_-time.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='time.cc' object='cachemgr__CGIEXT_-time.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-time.obj `if test -f 'time.cc'; then $(CYGPATH_W) 'time.cc'; else $(CYGPATH_W) '$(srcdir)/time.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-time.obj `if test -f 'time.cc'; then $(CYGPATH_W) 'time.cc'; else $(CYGPATH_W) '$(srcdir)/time.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -763,11 +1062,18 @@ -rm -rf .libs _libs install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -796,16 +1102,21 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -834,27 +1145,28 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -869,57 +1181,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -935,12 +1202,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -952,15 +1214,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -969,116 +1227,182 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1110,13 +1434,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -1156,11 +1477,19 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1248,13 +1577,12 @@ uninstall-man: uninstall-man1 uninstall-man8 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean clean-binPROGRAMS \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool ctags ctags-recursive distclean \ + clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ @@ -1266,7 +1594,7 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS \ uninstall-local uninstall-man uninstall-man1 uninstall-man8 diff -u -r -N squid-3.4.4/tools/purge/Makefile.in squid-3.4.4.1/tools/purge/Makefile.in --- squid-3.4.4/tools/purge/Makefile.in 2014-03-09 01:41:58.000000000 -0800 +++ squid-3.4.4.1/tools/purge/Makefile.in 2014-04-23 05:51:39.000000000 -0700 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/src/Common.am +DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -49,7 +94,7 @@ $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \ $(top_srcdir)/acinclude/pkg.m4 \ $(top_srcdir)/acinclude/lib-checks.m4 \ - $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \ + $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \ $(top_srcdir)/helpers/basic_auth/modules.m4 \ $(top_srcdir)/helpers/basic_auth/DB/required.m4 \ @@ -115,39 +160,296 @@ $(am__DEPENDENCIES_1) am__DEPENDENCIES_3 = purge_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(purge_SOURCES) DIST_SOURCES = $(purge_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ ARGZ_H = @ARGZ_H@ AR_R = @AR_R@ @@ -186,6 +488,7 @@ DISK_MODULES = @DISK_MODULES@ DISK_OS_LIBS = @DISK_OS_LIBS@ DISK_PROGRAMS = @DISK_PROGRAMS@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECAP_LIBS = @ECAP_LIBS@ @@ -203,6 +506,7 @@ FALSE = @FALSE@ FGREP = @FGREP@ GREP = @GREP@ +HAVE_CXX11 = @HAVE_CXX11@ HOSTCXX = @HOSTCXX@ ICAP_LIBS = @ICAP_LIBS@ INCLTDL = @INCLTDL@ @@ -240,11 +544,13 @@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NETTLELIB = @NETTLELIB@ NM = @NM@ NMEDIT = @NMEDIT@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ @@ -303,6 +609,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -390,7 +697,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/Common.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -412,6 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/src/Common.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -423,14 +731,19 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -451,7 +764,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -473,9 +787,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -purge$(EXEEXT): $(purge_OBJECTS) $(purge_DEPENDENCIES) + +purge$(EXEEXT): $(purge_OBJECTS) $(purge_DEPENDENCIES) $(EXTRA_purge_DEPENDENCIES) @rm -f purge$(EXEEXT) - $(CXXLINK) $(purge_OBJECTS) $(purge_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(purge_OBJECTS) $(purge_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -492,25 +807,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squid-tlv.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -518,26 +833,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -549,15 +853,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -566,101 +866,180 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -711,11 +1090,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -800,19 +1187,20 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS