diff -ruN squid-2.7.STABLE8/aclocal.m4 squid-2.7.STABLE9/aclocal.m4 --- squid-2.7.STABLE8/aclocal.m4 2009-05-01 03:23:59.000000000 +0200 +++ squid-2.7.STABLE9/aclocal.m4 2010-03-14 19:19:03.000000000 +0100 @@ -941,4 +941,5 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_lib_socket_nsl.m4]) m4_include([acinclude.m4]) diff -ruN squid-2.7.STABLE8/bootstrap.sh squid-2.7.STABLE9/bootstrap.sh --- squid-2.7.STABLE8/bootstrap.sh 2006-06-06 20:57:47.000000000 +0200 +++ squid-2.7.STABLE9/bootstrap.sh 2010-03-14 19:01:54.000000000 +0100 @@ -77,7 +77,7 @@ mkdir -p cfgaux # Bootstrap the autotool subsystems - bootstrap aclocal$amver + bootstrap aclocal$amver -I m4 bootstrap autoheader$acver bootstrap automake$amver --foreign --add-missing --copy -f bootstrap autoconf$acver --force diff -ruN squid-2.7.STABLE8/ChangeLog squid-2.7.STABLE9/ChangeLog --- squid-2.7.STABLE8/ChangeLog 2010-03-10 01:40:07.000000000 +0100 +++ squid-2.7.STABLE9/ChangeLog 2010-03-14 22:40:46.000000000 +0100 @@ -1,4 +1,10 @@ -Changes to squid-2.7.STABLE8 <10 March 2010) +Changes to squid-2.7.STABLE9 (15 March 2010) + + - 2.7.STABLE8 failed to compile with OpenSSL 0.9.8 on some systems + - failure to detect certain system libraries on some systems + resulting in compilation errors + +Changes to squid-2.7.STABLE8 (10 March 2010) - Bug #2458: reply_body_max_size incorrectly documented - Bug #2858: Segment violation in HTCP diff -ruN squid-2.7.STABLE8/configure squid-2.7.STABLE9/configure --- squid-2.7.STABLE8/configure 2010-03-10 01:41:19.000000000 +0100 +++ squid-2.7.STABLE9/configure 2010-03-17 01:10:13.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.430.2.22 . +# From configure.in Revision: 1.430.2.25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for Squid Web Proxy 2.7.STABLE8. +# Generated by GNU Autoconf 2.62 for Squid Web Proxy 2.7.STABLE9. # # Report bugs to . # @@ -597,8 +597,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='2.7.STABLE8' -PACKAGE_STRING='Squid Web Proxy 2.7.STABLE8' +PACKAGE_VERSION='2.7.STABLE9' +PACKAGE_STRING='Squid Web Proxy 2.7.STABLE9' PACKAGE_BUGREPORT='http://bugs.squid-cache.org/' ac_default_prefix=/usr/local/squid @@ -795,10 +795,10 @@ AR AR_R ALLOCA +NIS_LIBS CRYPTLIB LIB_EPOLL LIB_LDAP -LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE @@ -1460,7 +1460,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 2.7.STABLE8 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 2.7.STABLE9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1530,7 +1530,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 2.7.STABLE8:";; + short | recursive ) echo "Configuration of Squid Web Proxy 2.7.STABLE9:";; esac cat <<\_ACEOF @@ -1816,7 +1816,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 2.7.STABLE8 +Squid Web Proxy configure 2.7.STABLE9 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1830,7 +1830,7 @@ 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 2.7.STABLE8, which was +It was created by Squid Web Proxy $as_me 2.7.STABLE9, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2547,7 +2547,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='2.7.STABLE8' + VERSION='2.7.STABLE9' cat >>confdefs.h <<_ACEOF @@ -24432,14 +24432,12 @@ if test "x$use_libcap" != "xno"; then # cap_clear_flag is the most recent libcap function we require - -{ $as_echo "$as_me:$LINENO: checking for cap_clear_flag in -lcap" >&5 -$as_echo_n "checking for cap_clear_flag in -lcap... " >&6; } -if test "${ac_cv_lib_cap_cap_clear_flag+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing cap_clear_flag" >&5 +$as_echo_n "checking for library containing cap_clear_flag... " >&6; } +if test "${ac_cv_search_cap_clear_flag+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcap $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24462,6 +24460,119 @@ return 0; } _ACEOF +for ac_lib in '' cap; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_cap_clear_flag=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_cap_clear_flag+set}" = set; then + break +fi +done +if test "${ac_cv_search_cap_clear_flag+set}" = set; then + : +else + ac_cv_search_cap_clear_flag=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_cap_clear_flag" >&5 +$as_echo "$ac_cv_search_cap_clear_flag" >&6; } +ac_res=$ac_cv_search_cap_clear_flag +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +for ac_func in cap_clear_flag +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in @@ -24483,31 +24594,32 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_cap_cap_clear_flag=yes + eval "$as_ac_var=yes" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_cap_cap_clear_flag=no + eval "$as_ac_var=no" fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_clear_flag" >&5 -$as_echo "$ac_cv_lib_cap_cap_clear_flag" >&6; } -if test $ac_cv_lib_cap_cap_clear_flag = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test `eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCAP 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - LIBS="-lcap $LIBS" - fi +done - if test "x$ac_cv_lib_cap_cap_clear_flag" = xyes; then + if test "x$ac_cv_func_cap_clear_flag" = xyes; then use_libcap=yes else if test "x$use_libcap" = "xyes"; then @@ -24746,14 +24858,15 @@ fi fi +# Check for needed libraries + -{ $as_echo "$as_me:$LINENO: checking for main in -lnsl" >&5 -$as_echo_n "checking for main in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_main+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 +$as_echo_n "checking for library containing gethostbyname... " >&6; } +if test "${ac_cv_search_gethostbyname+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24761,16 +24874,29 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 gethostbyname (); int main () { -return main (); +return gethostbyname (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -24791,38 +24917,131 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_nsl_main=yes + ac_cv_search_gethostbyname=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nsl_main=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_gethostbyname+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5 -$as_echo "$ac_cv_lib_nsl_main" >&6; } -if test $ac_cv_lib_nsl_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 +done +if test "${ac_cv_search_gethostbyname+set}" = set; then + : +else + ac_cv_search_gethostbyname=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 +$as_echo "$ac_cv_search_gethostbyname" >&6; } +ac_res=$ac_cv_search_gethostbyname +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5 +$as_echo_n "checking for library containing socket... " >&6; } +if test "${ac_cv_search_socket+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - LIBS="-lnsl $LIBS" +/* 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 socket (); +int +main () +{ +return socket (); + ; + return 0; +} +_ACEOF +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_socket=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_socket+set}" = set; then + break +fi +done +if test "${ac_cv_search_socket+set}" = set; then + : +else + ac_cv_search_socket=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 +$as_echo "$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +else -{ $as_echo "$as_me:$LINENO: checking for main in -lsocket" >&5 -$as_echo_n "checking for main in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_main+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_socket+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" +LIBS="-lsocket -lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24830,11 +25049,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 socket (); int main () { -return main (); +return socket (); ; return 0; } @@ -24860,12 +25085,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_socket_main=yes + ac_cv_lib_socket_socket=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_socket_main=no + ac_cv_lib_socket_socket=no fi rm -rf conftest.dSYM @@ -24873,17 +25098,107 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 -$as_echo "$ac_cv_lib_socket_main" >&6; } -if test $ac_cv_lib_socket_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test $ac_cv_lib_socket_socket = yes; then + LIBS="-lsocket -lnsl $LIBS" +fi + +fi + + + +# yp_match is in libnsl on some systems, needed by helpers/basic_auth/YP +saved_LIBS="$LIBS" +{ $as_echo "$as_me:$LINENO: checking for library containing yp_match" >&5 +$as_echo_n "checking for library containing yp_match... " >&6; } +if test "${ac_cv_search_yp_match+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* 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 yp_match (); +int +main () +{ +return yp_match (); + ; + return 0; +} _ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_yp_match=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="-lsocket $LIBS" fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_yp_match+set}" = set; then + break +fi +done +if test "${ac_cv_search_yp_match+set}" = set; then + : +else + ac_cv_search_yp_match=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_match" >&5 +$as_echo "$ac_cv_search_yp_match" >&6; } +ac_res=$ac_cv_search_yp_match +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_res" = "none required" || NIS_LIBS="$ac_res $NIS_LIBS";LIBS="$saved_LIBS" +fi + + + case "$host_os" in mingw|mingw32) { $as_echo "$as_me:$LINENO: checking for winsock" >&5 @@ -25337,9 +25652,9 @@ echo "skipping libmalloc check (--enable-dlmalloc specified)" else -{ $as_echo "$as_me:$LINENO: checking for main in -lgnumalloc" >&5 -$as_echo_n "checking for main in -lgnumalloc... " >&6; } -if test "${ac_cv_lib_gnumalloc_main+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for malloc in -lgnumalloc" >&5 +$as_echo_n "checking for malloc in -lgnumalloc... " >&6; } +if test "${ac_cv_lib_gnumalloc_malloc+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25351,11 +25666,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 malloc (); int main () { -return main (); +return malloc (); ; return 0; } @@ -25381,12 +25702,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_gnumalloc_main=yes + ac_cv_lib_gnumalloc_malloc=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gnumalloc_main=no + ac_cv_lib_gnumalloc_malloc=no fi rm -rf conftest.dSYM @@ -25394,9 +25715,9 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gnumalloc_main" >&5 -$as_echo "$ac_cv_lib_gnumalloc_main" >&6; } -if test $ac_cv_lib_gnumalloc_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gnumalloc_malloc" >&5 +$as_echo "$ac_cv_lib_gnumalloc_malloc" >&6; } +if test $ac_cv_lib_gnumalloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGNUMALLOC 1 _ACEOF @@ -25420,10 +25741,9 @@ ;; *) - -{ $as_echo "$as_me:$LINENO: checking for main in -lmalloc" >&5 -$as_echo_n "checking for main in -lmalloc... " >&6; } -if test "${ac_cv_lib_malloc_main+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for malloc in -lmalloc" >&5 +$as_echo_n "checking for malloc in -lmalloc... " >&6; } +if test "${ac_cv_lib_malloc_malloc+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25435,11 +25755,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 malloc (); int main () { -return main (); +return malloc (); ; return 0; } @@ -25465,12 +25791,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_malloc_main=yes + ac_cv_lib_malloc_malloc=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_malloc_main=no + ac_cv_lib_malloc_malloc=no fi rm -rf conftest.dSYM @@ -25478,9 +25804,9 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_main" >&5 -$as_echo "$ac_cv_lib_malloc_main" >&6; } -if test $ac_cv_lib_malloc_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_malloc" >&5 +$as_echo "$ac_cv_lib_malloc_malloc" >&6; } +if test $ac_cv_lib_malloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMALLOC 1 _ACEOF @@ -25495,222 +25821,13 @@ fi -{ $as_echo "$as_me:$LINENO: checking for main in -lbsd" >&5 -$as_echo_n "checking for main in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_main+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_bsd_main=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_main=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_main" >&5 -$as_echo "$ac_cv_lib_bsd_main" >&6; } -if test $ac_cv_lib_bsd_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBBSD 1 -_ACEOF - - LIBS="-lbsd $LIBS" - -fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lregex" >&5 -$as_echo_n "checking for main in -lregex... " >&6; } -if test "${ac_cv_lib_regex_main+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lregex $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_regex_main=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_regex_main=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_regex_main" >&5 -$as_echo "$ac_cv_lib_regex_main" >&6; } -if test $ac_cv_lib_regex_main = yes; then - REGEXLIB="-lregex" -fi - - -case "$host_os" in -mingw|mingw32) - echo "Use MSVCRT for math functions." - ;; - *) - -{ $as_echo "$as_me:$LINENO: checking for main in -lm" >&5 -$as_echo_n "checking for main in -lm... " >&6; } -if test "${ac_cv_lib_m_main+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_m_main=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_main=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 -$as_echo "$ac_cv_lib_m_main" >&6; } -if test $ac_cv_lib_m_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -fi - - ;; -esac - -{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } -if test "${ac_cv_lib_crypt_crypt+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for regcomp in -lregex" >&5 +$as_echo_n "checking for regcomp in -lregex... " >&6; } +if test "${ac_cv_lib_regex_regcomp+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypt $LIBS" +LIBS="-lregex $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25724,11 +25841,11 @@ #ifdef __cplusplus extern "C" #endif -char crypt (); +char regcomp (); int main () { -return crypt (); +return regcomp (); ; return 0; } @@ -25754,12 +25871,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_crypt_crypt=yes + ac_cv_lib_regex_regcomp=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_crypt_crypt=no + ac_cv_lib_regex_regcomp=no fi rm -rf conftest.dSYM @@ -25767,22 +25884,26 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test $ac_cv_lib_crypt_crypt = yes; then - CRYPTLIB=" -lcrypt " +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_regex_regcomp" >&5 +$as_echo "$ac_cv_lib_regex_regcomp" >&6; } +if test $ac_cv_lib_regex_regcomp = yes; then + REGEXLIB="-lregex" fi +case "$host_os" in +mingw|mingw32) + echo "Use MSVCRT for math functions." + ;; + *) - -{ $as_echo "$as_me:$LINENO: checking for MD5Init in -lmd5" >&5 -$as_echo_n "checking for MD5Init in -lmd5... " >&6; } -if test "${ac_cv_lib_md5_MD5Init+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for rint in -lm" >&5 +$as_echo_n "checking for rint in -lm... " >&6; } +if test "${ac_cv_lib_m_rint+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmd5 $LIBS" +LIBS="-lm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25796,11 +25917,11 @@ #ifdef __cplusplus extern "C" #endif -char MD5Init (); +char rint (); int main () { -return MD5Init (); +return rint (); ; return 0; } @@ -25826,12 +25947,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_md5_MD5Init=yes + ac_cv_lib_m_rint=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_md5_MD5Init=no + ac_cv_lib_m_rint=no fi rm -rf conftest.dSYM @@ -25839,26 +25960,27 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_md5_MD5Init" >&5 -$as_echo "$ac_cv_lib_md5_MD5Init" >&6; } -if test $ac_cv_lib_md5_MD5Init = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_rint" >&5 +$as_echo "$ac_cv_lib_m_rint" >&6; } +if test $ac_cv_lib_m_rint = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMD5 1 +#define HAVE_LIBM 1 _ACEOF - LIBS="-lmd5 $LIBS" + LIBS="-lm $LIBS" fi + ;; +esac - -{ $as_echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5 -$as_echo_n "checking for MD5Init in -lmd... " >&6; } -if test "${ac_cv_lib_md_MD5Init+set}" = set; then +saved_LIBS="$LIBS" +{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5 +$as_echo_n "checking for library containing crypt... " >&6; } +if test "${ac_cv_search_crypt+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmd $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25872,16 +25994,23 @@ #ifdef __cplusplus extern "C" #endif -char MD5Init (); +char crypt (); int main () { -return MD5Init (); +return crypt (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' crypt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -25902,40 +26031,45 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_md_MD5Init=yes + ac_cv_search_crypt=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_md_MD5Init=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_crypt+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 -$as_echo "$ac_cv_lib_md_MD5Init" >&6; } -if test $ac_cv_lib_md_MD5Init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMD 1 -_ACEOF - - LIBS="-lmd $LIBS" - +done +if test "${ac_cv_search_crypt+set}" = set; then + : +else + ac_cv_search_crypt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5 +$as_echo "$ac_cv_search_crypt" >&6; } +ac_res=$ac_cv_search_crypt +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_res" = "none required" || CRYPTLIB="$ac_res $CRYPTLIB";LIBS="$saved_LIBS" fi -if test "$with_dl" = "yes"; then -{ $as_echo "$as_me:$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 +{ $as_echo "$as_me:$LINENO: checking for library containing MD5Init" >&5 +$as_echo_n "checking for library containing MD5Init... " >&6; } +if test "${ac_cv_search_MD5Init+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25949,16 +26083,23 @@ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char MD5Init (); int main () { -return dlopen (); +return MD5Init (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' md5 md; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -25979,58 +26120,46 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_dl_dlopen=yes + ac_cv_search_MD5Init=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_MD5Init+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBS="-ldl $LIBS" - +done +if test "${ac_cv_search_MD5Init+set}" = set; then + : +else + ac_cv_search_MD5Init=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_MD5Init" >&5 +$as_echo "$ac_cv_search_MD5Init" >&6; } +ac_res=$ac_cv_search_MD5Init +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -if test "$with_pthreads" = "yes"; then - CFLAGS="$CFLAGS -D_REENTRANT" - case "$host" in - i386-unknown-freebsd*) - if test "$GCC" = "yes" ; then - if test -z "$PRESET_LDFLAGS"; then - LDFLAGS="$LDFLAGS -pthread" - fi - fi - ;; - *-solaris2.*) - if test "$GCC" = "yes" ; then - CFLAGS="$CFLAGS -pthreads" - else - CFLAGS="$CFLAGS -mt" - fi - ;; - esac -{ $as_echo "$as_me:$LINENO: checking for main in -lpthread" >&5 -$as_echo_n "checking for main in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_main+set}" = set; then + +if test "$with_dl" = "yes"; then + { $as_echo "$as_me:$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 $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26038,16 +26167,29 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 dlopen (); int main () { -return main (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' dl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -26068,41 +26210,65 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_pthread_main=yes + ac_cv_search_dlopen=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_main=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_dlopen+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 -$as_echo "$ac_cv_lib_pthread_main" >&6; } -if test $ac_cv_lib_pthread_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPTHREAD 1 -_ACEOF - - LIBS="-lpthread $LIBS" +done +if test "${ac_cv_search_dlopen+set}" = set; then + : +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -if test "$with_aio" = "yes"; then +if test "$with_pthreads" = "yes"; then + CFLAGS="$CFLAGS -D_REENTRANT" + case "$host" in + i386-unknown-freebsd*) + if test "$GCC" = "yes" ; then + if test -z "$PRESET_LDFLAGS"; then + LDFLAGS="$LDFLAGS -pthread" + fi + fi + ;; + *-solaris2.*) + if test "$GCC" = "yes" ; then + CFLAGS="$CFLAGS -pthreads" + else + CFLAGS="$CFLAGS -mt" + fi + ;; + esac -{ $as_echo "$as_me:$LINENO: checking for aio_read in -lrt" >&5 -$as_echo_n "checking for aio_read in -lrt... " >&6; } -if test "${ac_cv_lib_rt_aio_read+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +$as_echo_n "checking for pthread_create in -lpthread... " >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" +LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26116,11 +26282,11 @@ #ifdef __cplusplus extern "C" #endif -char aio_read (); +char pthread_create (); int main () { -return aio_read (); +return pthread_create (); ; return 0; } @@ -26146,12 +26312,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_rt_aio_read=yes + ac_cv_lib_pthread_pthread_create=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_rt_aio_read=no + ac_cv_lib_pthread_pthread_create=no fi rm -rf conftest.dSYM @@ -26159,24 +26325,26 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_aio_read" >&5 -$as_echo "$ac_cv_lib_rt_aio_read" >&6; } -if test $ac_cv_lib_rt_aio_read = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } +if test $ac_cv_lib_pthread_pthread_create = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 +#define HAVE_LIBPTHREAD 1 _ACEOF - LIBS="-lrt $LIBS" + LIBS="-lpthread $LIBS" + +fi -else +fi -{ $as_echo "$as_me:$LINENO: checking for aio_read in -laio" >&5 -$as_echo_n "checking for aio_read in -laio... " >&6; } -if test "${ac_cv_lib_aio_aio_read+set}" = set; then +if test "$with_aio" = "yes"; then + { $as_echo "$as_me:$LINENO: checking for library containing aio_read" >&5 +$as_echo_n "checking for library containing aio_read... " >&6; } +if test "${ac_cv_search_aio_read+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-laio $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26199,7 +26367,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' rt aio; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -26220,42 +26395,47 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_aio_aio_read=yes + ac_cv_search_aio_read=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_aio_aio_read=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_aio_read+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aio_aio_read" >&5 -$as_echo "$ac_cv_lib_aio_aio_read" >&6; } -if test $ac_cv_lib_aio_aio_read = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBAIO 1 -_ACEOF - - LIBS="-laio $LIBS" - +done +if test "${ac_cv_search_aio_read+set}" = set; then + : +else + ac_cv_search_aio_read=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_aio_read" >&5 +$as_echo "$ac_cv_search_aio_read" >&6; } +ac_res=$ac_cv_search_aio_read +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi LIB_EPOLL='' -{ $as_echo "$as_me:$LINENO: checking for epoll_ctl in -lepoll" >&5 -$as_echo_n "checking for epoll_ctl in -lepoll... " >&6; } -if test "${ac_cv_lib_epoll_epoll_ctl+set}" = set; then +saved_LIBS="$LIBS" +{ $as_echo "$as_me:$LINENO: checking for library containing epoll_ctl" >&5 +$as_echo_n "checking for library containing epoll_ctl... " >&6; } +if test "${ac_cv_search_epoll_ctl+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lepoll -L ./lib $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26278,7 +26458,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' epoll; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -26299,37 +26486,47 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_epoll_epoll_ctl=yes + ac_cv_search_epoll_ctl=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_epoll_epoll_ctl=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_epoll_ctl+set}" = set; then + break +fi +done +if test "${ac_cv_search_epoll_ctl+set}" = set; then + : +else + ac_cv_search_epoll_ctl=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_epoll_epoll_ctl" >&5 -$as_echo "$ac_cv_lib_epoll_epoll_ctl" >&6; } -if test $ac_cv_lib_epoll_epoll_ctl = yes; then - LIB_EPOLL="-lepoll" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_epoll_ctl" >&5 +$as_echo "$ac_cv_search_epoll_ctl" >&6; } +ac_res=$ac_cv_search_epoll_ctl +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_res" = "none required" || LIB_EPOLL="$ac_res $LIB_EPOLL";LIBS="$saved_LIBS" fi case "$host" in *-pc-sco3.2*) - -{ $as_echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -$as_echo_n "checking for strftime in -lintl... " >&6; } -if test "${ac_cv_lib_intl_strftime+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing strftime" >&5 +$as_echo_n "checking for library containing strftime... " >&6; } +if test "${ac_cv_search_strftime+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26352,7 +26549,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' intl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -26373,27 +26577,34 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_intl_strftime=yes + ac_cv_search_strftime=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_intl_strftime=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_strftime+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -$as_echo "$ac_cv_lib_intl_strftime" >&6; } -if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL 1 -_ACEOF - - LIBS="-lintl $LIBS" +done +if test "${ac_cv_search_strftime+set}" = set; then + : +else + ac_cv_search_strftime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strftime" >&5 +$as_echo "$ac_cv_search_strftime" >&6; } +ac_res=$ac_cv_search_strftime +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -26403,13 +26614,12 @@ case "$host_os" in mingw|mingw32) LIB_LDAP="-lwldap32" - LIB_LBER="" ;; *) LIB_LDAP="-lldap" - { $as_echo "$as_me:$LINENO: checking for main in -llber" >&5 -$as_echo_n "checking for main in -llber... " >&6; } -if test "${ac_cv_lib_lber_main+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for open in -llber" >&5 +$as_echo_n "checking for open in -llber... " >&6; } +if test "${ac_cv_lib_lber_open+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26421,11 +26631,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* 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 open (); int main () { -return main (); +return open (); ; return 0; } @@ -26451,12 +26667,12 @@ test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_lber_main=yes + ac_cv_lib_lber_open=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_lber_main=no + ac_cv_lib_lber_open=no fi rm -rf conftest.dSYM @@ -26464,17 +26680,16 @@ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_main" >&5 -$as_echo "$ac_cv_lib_lber_main" >&6; } -if test $ac_cv_lib_lber_main = yes; then - LIB_LBER="-llber" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_open" >&5 +$as_echo "$ac_cv_lib_lber_open" >&6; } +if test $ac_cv_lib_lber_open = yes; then + LIB_LDAP="${LIB_LDAP} -llber" fi ;; esac - DBLIB= { $as_echo "$as_me:$LINENO: checking if dbopen needs -ldb" >&5 $as_echo_n "checking if dbopen needs -ldb... " >&6; } @@ -29680,7 +29895,7 @@ # 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 2.7.STABLE8, which was +This file was extended by Squid Web Proxy $as_me 2.7.STABLE9, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29733,7 +29948,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Squid Web Proxy config.status 2.7.STABLE8 +Squid Web Proxy config.status 2.7.STABLE9 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -ruN squid-2.7.STABLE8/configure.in squid-2.7.STABLE9/configure.in --- squid-2.7.STABLE8/configure.in 2010-03-10 01:41:19.000000000 +0100 +++ squid-2.7.STABLE9/configure.in 2010-03-17 01:10:12.000000000 +0100 @@ -1,16 +1,16 @@ dnl dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.430.2.22 2010/03/07 15:56:50 hno Exp $ +dnl $Id: configure.in,v 1.430.2.25 2010/03/14 21:40:46 hno Exp $ dnl dnl dnl -AC_INIT(Squid Web Proxy, 2.7.STABLE8, http://bugs.squid-cache.org/, squid) +AC_INIT(Squid Web Proxy, 2.7.STABLE9, http://bugs.squid-cache.org/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE -AC_REVISION($Revision: 1.430.2.22 $)dnl +AC_REVISION($Revision: 1.430.2.25 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -2054,8 +2054,9 @@ ]) if test "x$use_libcap" != "xno"; then # cap_clear_flag is the most recent libcap function we require - AC_CHECK_LIB(cap, cap_clear_flag) - if test "x$ac_cv_lib_cap_cap_clear_flag" = xyes; then + AC_SEARCH_LIBS(cap_clear_flag, cap) + AC_CHECK_FUNCS(cap_clear_flag) + if test "x$ac_cv_func_cap_clear_flag" = xyes; then use_libcap=yes else if test "x$use_libcap" = "xyes"; then @@ -2083,9 +2084,15 @@ fi fi -dnl Check for needed libraries -AC_CHECK_LIB(nsl, main) -AC_CHECK_LIB(socket, main) +# Check for needed libraries + +AX_LIB_SOCKET_NSL + +# yp_match is in libnsl on some systems, needed by helpers/basic_auth/YP +saved_LIBS="$LIBS" +AC_SEARCH_LIBS([yp_match], [nsl], [test "$ac_res" = "none required" || NIS_LIBS="$ac_res $NIS_LIBS";LIBS="$saved_LIBS"]) +AC_SUBST(NIS_LIBS) + dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API case "$host_os" in mingw|mingw32) @@ -2146,7 +2153,8 @@ if test "x$ac_cv_enabled_dlmalloc" = "xyes" ; then echo "skipping libmalloc check (--enable-dlmalloc specified)" else - AC_CHECK_LIB(gnumalloc, main) + dnl prefer gnumalloc if available + AC_CHECK_LIB(gnumalloc, malloc) if test "$ac_cv_lib_gnumalloc_main" = "yes"; then echo "Disabling extended malloc functions when using gnumalloc" ac_cv_func_mallinfo=no @@ -2161,40 +2169,46 @@ echo "skipping libmalloc check for $host" ;; *) - - AC_CHECK_LIB(malloc, main) + dnl prefer libmalloc if available + AC_CHECK_LIB(malloc, malloc) ;; esac fi fi -AC_CHECK_LIB(bsd, main) -AC_CHECK_LIB(regex, main, [REGEXLIB="-lregex"]) +dnl no idea who requires libbsd, or what function to look for. Been around since day 0 +dnl but not needed on any of our main platforms and may contain stuff we do not want +dnl as can be seen below where -lbsd is removed from many systems +dnl AC_CHECK_LIB(bsd, main) + +dnl prefer separate regex library if available +AC_CHECK_LIB(regex, regcomp, [REGEXLIB="-lregex"]) case "$host_os" in mingw|mingw32) + dnl Is this special case really required, doesn't AC_CHECK_LIB work? echo "Use MSVCRT for math functions." ;; *) - AC_CHECK_LIB(m, main) + AC_CHECK_LIB(m, rint) ;; esac dnl Check for libcrypt dnl Some of our helpers use crypt(3) which may be in libc, or in dnl libcrypt (eg FreeBSD) -AC_CHECK_LIB(crypt, crypt, [CRYPTLIB=" -lcrypt "]) +saved_LIBS="$LIBS" +AC_SEARCH_LIBS([crypt], [crypt], [test "$ac_res" = "none required" || CRYPTLIB="$ac_res $CRYPTLIB";LIBS="$saved_LIBS"]) AC_SUBST(CRYPTLIB) dnl Solaris10 provides MD5 natively through libmd5 -AC_CHECK_LIB(md5, MD5Init) - dnl FreeBSD provides MD5 natively through libmd -AC_CHECK_LIB(md, MD5Init) +AC_SEARCH_LIBS([MD5Init], [md5 md]) + dnl Check for libdl, used by auth_modules/PAM if test "$with_dl" = "yes"; then - AC_CHECK_LIB(dl, dlopen) + AC_SEARCH_LIBS([dlopen], [dl]) fi dnl Check for pthreads @@ -2217,19 +2231,20 @@ fi ;; esac - AC_CHECK_LIB(pthread, main) + AC_CHECK_LIB(pthread, pthread_create) fi dnl Check for librt dnl We use AIO in the coss store if test "$with_aio" = "yes"; then dnl On some systems POSIX AIO functions are in libaio - AC_CHECK_LIB(rt, aio_read,,AC_CHECK_LIB(aio, aio_read)) + AC_SEARCH_LIBS(aio_read, [rt aio]) fi LIB_EPOLL='' dnl Check for libepoll -AC_CHECK_LIB(epoll, epoll_ctl,[LIB_EPOLL="-lepoll"],,[-L ./lib]) +saved_LIBS="$LIBS" +AC_SEARCH_LIBS([epoll_ctl], [epoll], [test "$ac_res" = "none required" || LIB_EPOLL="$ac_res $LIB_EPOLL";LIBS="$saved_LIBS"]) AC_SUBST(LIB_EPOLL) dnl -lintl is needed on SCO version 3.2v4.2 for strftime() @@ -2237,7 +2252,7 @@ dnl Mon, 18 Jan 1999 17:48:00 GMT case "$host" in *-pc-sco3.2*) - AC_CHECK_LIB(intl, strftime) + AC_SEARCH_LIBS(strftime, intl) ;; esac @@ -2246,16 +2261,17 @@ case "$host_os" in mingw|mingw32) LIB_LDAP="-lwldap32" - LIB_LBER="" ;; *) LIB_LDAP="-lldap" dnl LDAP helpers need to know if -llber is needed or not - AC_CHECK_LIB(lber, main, [LIB_LBER="-llber"]) + dnl unfortunately there is no well defined function API to + dnl look for so we use AC_CHECK_LIB and just check for some + dnl C-library function. + AC_CHECK_LIB(lber, open, [LIB_LDAP="${LIB_LDAP} -llber"]) ;; esac AC_SUBST(LIB_LDAP) -AC_SUBST(LIB_LBER) dnl Check for libdb DBLIB= diff -ruN squid-2.7.STABLE8/contrib/Makefile.in squid-2.7.STABLE9/contrib/Makefile.in --- squid-2.7.STABLE8/contrib/Makefile.in 2009-05-01 03:24:02.000000000 +0200 +++ squid-2.7.STABLE9/contrib/Makefile.in 2010-03-14 21:27:05.000000000 +0100 @@ -39,8 +39,8 @@ subdir = contrib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,7 +98,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -110,6 +109,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/doc/Makefile.in squid-2.7.STABLE9/doc/Makefile.in --- squid-2.7.STABLE8/doc/Makefile.in 2009-05-01 03:24:03.000000000 +0200 +++ squid-2.7.STABLE9/doc/Makefile.in 2010-03-14 21:27:06.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.36.2.1 2009/05/01 01:24:03 squidadm Exp $ +# $Id: Makefile.in,v 1.36.2.3 2010/03/14 20:27:06 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -42,8 +42,8 @@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/errors/Makefile.in squid-2.7.STABLE9/errors/Makefile.in --- squid-2.7.STABLE8/errors/Makefile.in 2009-05-01 03:24:03.000000000 +0200 +++ squid-2.7.STABLE9/errors/Makefile.in 2010-03-14 21:27:06.000000000 +0100 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.53.2.2 2009/05/01 01:24:03 squidadm Exp $ +# $Id: Makefile.in,v 1.53.2.4 2010/03/14 20:27:06 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -38,8 +38,8 @@ subdir = errors DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,7 +97,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -109,6 +108,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/DB/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/DB/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/DB/Makefile.in 2009-05-01 03:24:04.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/DB/Makefile.in 2010-03-14 21:27:08.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.2.1 2009/05/01 01:24:04 squidadm Exp $ +# $Id: Makefile.in,v 1.7.2.3 2010/03/14 20:27:08 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -43,8 +43,8 @@ subdir = helpers/basic_auth/DB DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -108,7 +108,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -120,6 +119,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/getpwnam/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/getpwnam/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/getpwnam/Makefile.in 2009-05-01 03:24:19.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/getpwnam/Makefile.in 2010-03-14 21:27:13.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42.2.1 2009/05/01 01:24:19 squidadm Exp $ +# $Id: Makefile.in,v 1.42.2.3 2010/03/14 20:27:13 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/getpwnam DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -133,6 +132,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/LDAP/Makefile.am squid-2.7.STABLE9/helpers/basic_auth/LDAP/Makefile.am --- squid-2.7.STABLE8/helpers/basic_auth/LDAP/Makefile.am 2006-05-16 05:24:54.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/LDAP/Makefile.am 2010-03-14 19:01:54.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.6 2006/05/16 03:24:54 hno Exp $ +# $Id: Makefile.am,v 1.6.6.1 2010/03/14 18:01:54 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,5 +11,5 @@ EXTRA_DIST = squid_ldap_auth.8 squid_ldap_auth_SOURCES = squid_ldap_auth.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include diff -ruN squid-2.7.STABLE8/helpers/basic_auth/LDAP/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/LDAP/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/LDAP/Makefile.in 2009-05-01 03:24:05.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/LDAP/Makefile.in 2010-03-14 21:27:08.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.44.2.1 2009/05/01 01:24:05 squidadm Exp $ +# $Id: Makefile.in,v 1.44.2.3 2010/03/14 20:27:08 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/LDAP DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -59,7 +59,7 @@ squid_ldap_auth_LDADD = $(LDADD) am__DEPENDENCIES_1 = squid_ldap_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -124,7 +124,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -136,6 +135,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -222,7 +222,7 @@ man_MANS = squid_ldap_auth.8 EXTRA_DIST = squid_ldap_auth.8 squid_ldap_auth_SOURCES = squid_ldap_auth.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include all: all-am diff -ruN squid-2.7.STABLE8/helpers/basic_auth/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/Makefile.in 2009-05-01 03:24:04.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/Makefile.in 2010-03-14 21:27:07.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.46.2.1 2009/05/01 01:24:04 squidadm Exp $ +# $Id: Makefile.in,v 1.46.2.3 2010/03/14 20:27:07 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -39,8 +39,8 @@ subdir = helpers/basic_auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -121,6 +120,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/MSNT/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/MSNT/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/MSNT/Makefile.in 2009-05-01 03:24:06.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/MSNT/Makefile.in 2010-03-14 21:27:09.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.47.2.1 2009/05/01 01:24:06 squidadm Exp $ +# $Id: Makefile.in,v 1.47.2.3 2010/03/14 20:27:09 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -45,8 +45,8 @@ subdir = helpers/basic_auth/MSNT DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -133,7 +133,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -145,6 +144,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/mswin_sspi/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/mswin_sspi/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/mswin_sspi/Makefile.in 2009-05-01 03:24:20.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/mswin_sspi/Makefile.in 2010-03-14 21:27:13.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.16.2.1 2009/05/01 01:24:20 squidadm Exp $ +# $Id: Makefile.in,v 1.16.2.3 2010/03/14 20:27:13 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/mswin_sspi DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/multi-domain-NTLM/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/multi-domain-NTLM/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/multi-domain-NTLM/Makefile.in 2009-05-01 03:24:21.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/multi-domain-NTLM/Makefile.in 2010-03-14 21:27:14.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.40.2.1 2009/05/01 01:24:21 squidadm Exp $ +# $Id: Makefile.in,v 1.40.2.3 2010/03/14 20:27:14 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -43,8 +43,8 @@ subdir = helpers/basic_auth/multi-domain-NTLM DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/NCSA/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/NCSA/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/NCSA/Makefile.in 2009-05-01 03:24:06.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/NCSA/Makefile.in 2010-03-14 21:27:09.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.44.2.1 2009/05/01 01:24:06 squidadm Exp $ +# $Id: Makefile.in,v 1.44.2.3 2010/03/14 20:27:09 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/NCSA DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -136,6 +135,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/PAM/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/PAM/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/PAM/Makefile.in 2009-05-01 03:24:07.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/PAM/Makefile.in 2010-03-14 21:27:10.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.43.2.1 2009/05/01 01:24:07 squidadm Exp $ +# $Id: Makefile.in,v 1.43.2.3 2010/03/14 20:27:10 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/PAM DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -135,6 +134,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/POP3/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/POP3/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/POP3/Makefile.in 2009-05-01 03:24:13.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/POP3/Makefile.in 2010-03-14 21:27:10.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.5.2.1 2009/05/01 01:24:13 squidadm Exp $ +# $Id: Makefile.in,v 1.5.2.3 2010/03/14 20:27:10 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -43,8 +43,8 @@ subdir = helpers/basic_auth/POP3 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/SASL/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/SASL/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/SASL/Makefile.in 2009-05-01 03:24:16.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/SASL/Makefile.in 2010-03-14 21:27:11.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.40.2.1 2009/05/01 01:24:16 squidadm Exp $ +# $Id: Makefile.in,v 1.40.2.3 2010/03/14 20:27:11 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/SASL DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/SMB/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/SMB/Makefile.in 2009-05-01 03:24:17.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.in 2010-03-14 21:27:12.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.43.2.1 2009/05/01 01:24:17 squidadm Exp $ +# $Id: Makefile.in,v 1.43.2.3 2010/03/14 20:27:12 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -51,8 +51,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -131,7 +131,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -143,6 +142,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/squid_radius_auth/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/squid_radius_auth/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/squid_radius_auth/Makefile.in 2009-05-01 03:24:22.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/squid_radius_auth/Makefile.in 2010-03-14 21:27:14.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.6.6.1 2009/05/01 01:24:22 squidadm Exp $ +# $Id: Makefile.in,v 1.6.6.3 2010/03/14 20:27:14 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/basic_auth/squid_radius_auth DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -136,6 +135,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/basic_auth/YP/Makefile.am squid-2.7.STABLE9/helpers/basic_auth/YP/Makefile.am --- squid-2.7.STABLE8/helpers/basic_auth/YP/Makefile.am 2005-05-17 18:56:26.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/YP/Makefile.am 2010-03-14 21:25:54.000000000 +0100 @@ -1,11 +1,11 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.5 2005/05/17 16:56:26 hno Exp $ +# $Id: Makefile.am,v 1.5.6.1 2010/03/14 20:25:54 hno Exp $ # # libexec_PROGRAMS = yp_auth yp_auth_SOURCES = yp_auth.c nis_support.h nis_support.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(NIS_LIBS) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include diff -ruN squid-2.7.STABLE8/helpers/basic_auth/YP/Makefile.in squid-2.7.STABLE9/helpers/basic_auth/YP/Makefile.in --- squid-2.7.STABLE8/helpers/basic_auth/YP/Makefile.in 2009-05-01 03:24:18.000000000 +0200 +++ squid-2.7.STABLE9/helpers/basic_auth/YP/Makefile.in 2010-03-14 21:27:12.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.44.2.1 2009/05/01 01:24:18 squidadm Exp $ +# $Id: Makefile.in,v 1.44.2.3 2010/03/14 20:27:12 squidadm Exp $ # # @@ -43,8 +43,8 @@ subdir = helpers/basic_auth/YP DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -57,7 +57,8 @@ yp_auth_OBJECTS = $(am_yp_auth_OBJECTS) yp_auth_LDADD = $(LDADD) am__DEPENDENCIES_1 = -yp_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +yp_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -119,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -131,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -215,7 +216,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ yp_auth_SOURCES = yp_auth.c nis_support.h nis_support.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(NIS_LIBS) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include all: all-am diff -ruN squid-2.7.STABLE8/helpers/digest_auth/eDirectory/Makefile.am squid-2.7.STABLE9/helpers/digest_auth/eDirectory/Makefile.am --- squid-2.7.STABLE8/helpers/digest_auth/eDirectory/Makefile.am 2007-06-23 22:36:12.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/eDirectory/Makefile.am 2010-03-14 19:01:55.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1 2007/06/23 20:36:12 hno Exp $ +# $Id: Makefile.am,v 1.1.6.1 2010/03/14 18:01:55 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -16,4 +16,4 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) diff -ruN squid-2.7.STABLE8/helpers/digest_auth/eDirectory/Makefile.in squid-2.7.STABLE9/helpers/digest_auth/eDirectory/Makefile.in --- squid-2.7.STABLE8/helpers/digest_auth/eDirectory/Makefile.in 2009-05-01 03:24:23.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/eDirectory/Makefile.in 2010-03-14 21:27:15.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.4.2.1 2009/05/01 01:24:23 squidadm Exp $ +# $Id: Makefile.in,v 1.4.2.3 2010/03/14 20:27:15 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/digest_auth/eDirectory DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -61,7 +61,7 @@ am__DEPENDENCIES_1 = digest_edir_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -123,7 +123,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -135,6 +134,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -228,7 +228,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) all: all-am .SUFFIXES: diff -ruN squid-2.7.STABLE8/helpers/digest_auth/ldap/Makefile.am squid-2.7.STABLE9/helpers/digest_auth/ldap/Makefile.am --- squid-2.7.STABLE8/helpers/digest_auth/ldap/Makefile.am 2006-05-16 03:21:29.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/ldap/Makefile.am 2010-03-14 19:01:58.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1 2006/05/16 01:21:29 hno Exp $ +# $Id: Makefile.am,v 1.1.6.1 2010/03/14 18:01:58 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -14,4 +14,4 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) diff -ruN squid-2.7.STABLE8/helpers/digest_auth/ldap/Makefile.in squid-2.7.STABLE9/helpers/digest_auth/ldap/Makefile.in --- squid-2.7.STABLE8/helpers/digest_auth/ldap/Makefile.in 2009-05-01 03:24:24.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/ldap/Makefile.in 2010-03-14 21:27:16.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.21.2.1 2009/05/01 01:24:24 squidadm Exp $ +# $Id: Makefile.in,v 1.21.2.3 2010/03/14 20:27:16 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/digest_auth/ldap DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -61,7 +61,7 @@ am__DEPENDENCIES_1 = digest_ldap_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -123,7 +123,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -135,6 +134,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -226,7 +226,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) all: all-am .SUFFIXES: diff -ruN squid-2.7.STABLE8/helpers/digest_auth/Makefile.in squid-2.7.STABLE9/helpers/digest_auth/Makefile.in --- squid-2.7.STABLE8/helpers/digest_auth/Makefile.in 2009-05-01 03:24:22.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/Makefile.in 2010-03-14 21:27:15.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.41.2.1 2009/05/01 01:24:22 squidadm Exp $ +# $Id: Makefile.in,v 1.41.2.3 2010/03/14 20:27:15 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -39,8 +39,8 @@ subdir = helpers/digest_auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -121,6 +120,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/digest_auth/password/Makefile.in squid-2.7.STABLE9/helpers/digest_auth/password/Makefile.in --- squid-2.7.STABLE8/helpers/digest_auth/password/Makefile.in 2009-05-01 03:24:25.000000000 +0200 +++ squid-2.7.STABLE9/helpers/digest_auth/password/Makefile.in 2010-03-14 21:27:16.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42.2.1 2009/05/01 01:24:25 squidadm Exp $ +# $Id: Makefile.in,v 1.42.2.3 2010/03/14 20:27:16 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/digest_auth/password DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,7 +122,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -134,6 +133,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/ip_user/Makefile.in squid-2.7.STABLE9/helpers/external_acl/ip_user/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/ip_user/Makefile.in 2009-05-01 03:24:26.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/ip_user/Makefile.in 2010-03-14 21:27:17.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.29.2.1 2009/05/01 01:24:26 squidadm Exp $ +# $Id: Makefile.in,v 1.29.2.3 2010/03/14 20:27:17 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/external_acl/ip_user DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/ldap_group/Makefile.am squid-2.7.STABLE9/helpers/external_acl/ldap_group/Makefile.am --- squid-2.7.STABLE8/helpers/external_acl/ldap_group/Makefile.am 2006-05-22 22:42:04.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/ldap_group/Makefile.am 2010-03-14 19:02:01.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.6 2006/05/22 20:42:04 hno Exp $ +# $Id: Makefile.am,v 1.6.6.1 2010/03/14 18:02:01 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,5 +11,5 @@ EXTRA_DIST = squid_ldap_group.8 squid_ldap_group_SOURCES = squid_ldap_group.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@ +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) @XTRA_LIBS@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include diff -ruN squid-2.7.STABLE8/helpers/external_acl/ldap_group/Makefile.in squid-2.7.STABLE9/helpers/external_acl/ldap_group/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/ldap_group/Makefile.in 2009-05-01 03:24:27.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/ldap_group/Makefile.in 2010-03-14 21:27:18.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.30.2.1 2009/05/01 01:24:27 squidadm Exp $ +# $Id: Makefile.in,v 1.30.2.3 2010/03/14 20:27:18 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -45,8 +45,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -59,8 +59,7 @@ squid_ldap_group_OBJECTS = $(am_squid_ldap_group_OBJECTS) squid_ldap_group_LDADD = $(LDADD) am__DEPENDENCIES_1 = -squid_ldap_group_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +squid_ldap_group_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -125,7 +124,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -137,6 +135,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -223,7 +222,7 @@ man_MANS = squid_ldap_group.8 EXTRA_DIST = squid_ldap_group.8 squid_ldap_group_SOURCES = squid_ldap_group.c -LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@ +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) @XTRA_LIBS@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include all: all-am diff -ruN squid-2.7.STABLE8/helpers/external_acl/Makefile.in squid-2.7.STABLE9/helpers/external_acl/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/Makefile.in 2009-05-01 03:24:25.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/Makefile.in 2010-03-14 21:27:17.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.30.2.2 2009/05/01 01:24:25 squidadm Exp $ +# $Id: Makefile.in,v 1.30.2.4 2010/03/14 20:27:17 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -39,8 +39,8 @@ subdir = helpers/external_acl DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -121,6 +120,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/mswin_ad_group/Makefile.in squid-2.7.STABLE9/helpers/external_acl/mswin_ad_group/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/mswin_ad_group/Makefile.in 2009-08-17 02:37:20.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/mswin_ad_group/Makefile.in 2010-03-14 21:27:18.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1.2.3 2009/08/17 00:37:20 squidadm Exp $ +# $Id: Makefile.in,v 1.1.2.5 2010/03/14 20:27:18 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/external_acl/mswin_ad_group DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/mswin_lm_group/Makefile.in squid-2.7.STABLE9/helpers/external_acl/mswin_lm_group/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/mswin_lm_group/Makefile.in 2009-05-01 03:24:29.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/mswin_lm_group/Makefile.in 2010-03-14 21:27:19.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.15.2.1 2009/05/01 01:24:29 squidadm Exp $ +# $Id: Makefile.in,v 1.15.2.3 2010/03/14 20:27:19 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/external_acl/mswin_lm_group DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/session/Makefile.in squid-2.7.STABLE9/helpers/external_acl/session/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/session/Makefile.in 2009-05-01 03:24:30.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/session/Makefile.in 2010-03-14 21:27:19.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.16.2.1 2009/05/01 01:24:30 squidadm Exp $ +# $Id: Makefile.in,v 1.16.2.3 2010/03/14 20:27:19 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/external_acl/session DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,7 +123,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -135,6 +134,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/unix_group/Makefile.in squid-2.7.STABLE9/helpers/external_acl/unix_group/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/unix_group/Makefile.in 2009-05-01 03:24:30.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/unix_group/Makefile.in 2010-03-14 21:27:19.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.29.2.1 2009/05/01 01:24:30 squidadm Exp $ +# $Id: Makefile.in,v 1.29.2.3 2010/03/14 20:27:19 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/external_acl/unix_group DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,7 +122,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -134,6 +133,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/external_acl/wbinfo_group/Makefile.in squid-2.7.STABLE9/helpers/external_acl/wbinfo_group/Makefile.in --- squid-2.7.STABLE8/helpers/external_acl/wbinfo_group/Makefile.in 2009-05-01 03:24:31.000000000 +0200 +++ squid-2.7.STABLE9/helpers/external_acl/wbinfo_group/Makefile.in 2010-03-14 21:27:20.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.28.2.1 2009/05/01 01:24:31 squidadm Exp $ +# $Id: Makefile.in,v 1.28.2.3 2010/03/14 20:27:20 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -43,8 +43,8 @@ subdir = helpers/external_acl/wbinfo_group DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/Makefile.in squid-2.7.STABLE9/helpers/Makefile.in --- squid-2.7.STABLE8/helpers/Makefile.in 2009-05-01 03:24:03.000000000 +0200 +++ squid-2.7.STABLE9/helpers/Makefile.in 2010-03-14 21:27:07.000000000 +0100 @@ -34,8 +34,8 @@ subdir = helpers DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/negotiate_auth/Makefile.in squid-2.7.STABLE9/helpers/negotiate_auth/Makefile.in --- squid-2.7.STABLE8/helpers/negotiate_auth/Makefile.in 2009-05-01 03:24:32.000000000 +0200 +++ squid-2.7.STABLE9/helpers/negotiate_auth/Makefile.in 2010-03-14 21:27:20.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.18.2.1 2009/05/01 01:24:32 squidadm Exp $ +# $Id: Makefile.in,v 1.18.2.3 2010/03/14 20:27:20 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -39,8 +39,8 @@ subdir = helpers/negotiate_auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -121,6 +120,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/negotiate_auth/mswin_sspi/Makefile.in squid-2.7.STABLE9/helpers/negotiate_auth/mswin_sspi/Makefile.in --- squid-2.7.STABLE8/helpers/negotiate_auth/mswin_sspi/Makefile.in 2009-05-01 03:24:33.000000000 +0200 +++ squid-2.7.STABLE9/helpers/negotiate_auth/mswin_sspi/Makefile.in 2010-03-14 21:27:21.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.15.2.1 2009/05/01 01:24:33 squidadm Exp $ +# $Id: Makefile.in,v 1.15.2.3 2010/03/14 20:27:21 squidadm Exp $ # VPATH = @srcdir@ @@ -42,8 +42,8 @@ subdir = helpers/negotiate_auth/mswin_sspi DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -119,7 +119,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -131,6 +130,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/negotiate_auth/squid_kerb_auth/Makefile.in squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.in --- squid-2.7.STABLE8/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2009-09-17 00:36:24.000000000 +0200 +++ squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2010-03-14 21:27:21.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.6.2.3 2009/09/16 22:36:24 hno Exp $ +# $Id: Makefile.in,v 1.6.2.5 2010/03/14 20:27:21 squidadm Exp $ # VPATH = @srcdir@ @@ -42,8 +42,8 @@ subdir = helpers/negotiate_auth/squid_kerb_auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -133,6 +132,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/fakeauth/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/fakeauth/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/fakeauth/Makefile.in 2009-05-01 03:24:37.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/fakeauth/Makefile.in 2010-03-14 21:27:23.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.41.2.1 2009/05/01 01:24:37 squidadm Exp $ +# $Id: Makefile.in,v 1.41.2.3 2010/03/14 20:27:23 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,8 +44,8 @@ subdir = helpers/ntlm_auth/fakeauth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,7 +121,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -133,6 +132,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/Makefile.in 2009-05-01 03:24:34.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/Makefile.in 2010-03-14 21:27:22.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.43.2.1 2009/05/01 01:24:34 squidadm Exp $ +# $Id: Makefile.in,v 1.43.2.3 2010/03/14 20:27:22 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -39,8 +39,8 @@ subdir = helpers/ntlm_auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -109,7 +109,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -121,6 +120,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/mswin_sspi/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/mswin_sspi/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/mswin_sspi/Makefile.in 2009-05-01 03:24:37.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/mswin_sspi/Makefile.in 2010-03-14 21:27:24.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.15.2.1 2009/05/01 01:24:37 squidadm Exp $ +# $Id: Makefile.in,v 1.15.2.3 2010/03/14 20:27:24 squidadm Exp $ # VPATH = @srcdir@ @@ -42,8 +42,8 @@ subdir = helpers/ntlm_auth/mswin_sspi DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -118,7 +118,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -130,6 +129,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/no_check/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/no_check/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/no_check/Makefile.in 2009-05-01 03:24:38.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/no_check/Makefile.in 2010-03-14 21:27:24.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.43.2.1 2009/05/01 01:24:38 squidadm Exp $ +# $Id: Makefile.in,v 1.43.2.3 2010/03/14 20:27:24 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -43,8 +43,8 @@ subdir = helpers/ntlm_auth/no_check DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,7 +105,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -117,6 +116,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/SMB/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/SMB/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/SMB/Makefile.in 2009-05-01 03:24:35.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/SMB/Makefile.in 2010-03-14 21:27:22.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42.2.1 2009/05/01 01:24:35 squidadm Exp $ +# $Id: Makefile.in,v 1.42.2.3 2010/03/14 20:27:22 squidadm Exp $ # VPATH = @srcdir@ @@ -42,8 +42,8 @@ subdir = helpers/ntlm_auth/SMB DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -129,7 +129,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -141,6 +140,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/helpers/ntlm_auth/SMB/smbval/Makefile.in squid-2.7.STABLE9/helpers/ntlm_auth/SMB/smbval/Makefile.in --- squid-2.7.STABLE8/helpers/ntlm_auth/SMB/smbval/Makefile.in 2009-05-01 03:24:36.000000000 +0200 +++ squid-2.7.STABLE9/helpers/ntlm_auth/SMB/smbval/Makefile.in 2010-03-14 21:27:23.000000000 +0100 @@ -37,8 +37,8 @@ subdir = helpers/ntlm_auth/SMB/smbval DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -114,7 +114,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -126,6 +125,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/icons/Makefile.in squid-2.7.STABLE9/icons/Makefile.in --- squid-2.7.STABLE8/icons/Makefile.in 2009-05-01 03:24:39.000000000 +0200 +++ squid-2.7.STABLE9/icons/Makefile.in 2010-03-14 21:27:25.000000000 +0100 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.53.2.1 2009/05/01 01:24:39 squidadm Exp $ +# $Id: Makefile.in,v 1.53.2.3 2010/03/14 20:27:25 squidadm Exp $ # VPATH = @srcdir@ @@ -38,8 +38,8 @@ subdir = icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,7 +106,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -118,6 +117,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/include/autoconf.h.in squid-2.7.STABLE9/include/autoconf.h.in --- squid-2.7.STABLE8/include/autoconf.h.in 2010-03-08 05:38:53.000000000 +0100 +++ squid-2.7.STABLE9/include/autoconf.h.in 2010-03-14 19:19:28.000000000 +0100 @@ -79,6 +79,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BYTESWAP_H +/* Define to 1 if you have the `cap_clear_flag' function. */ +#undef HAVE_CAP_CLEAR_FLAG + /* Define to 1 if you have the `crypt' function. */ #undef HAVE_CRYPT @@ -188,51 +191,21 @@ /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE -/* Define to 1 if you have the `aio' library (-laio). */ -#undef HAVE_LIBAIO - -/* Define to 1 if you have the `bsd' library (-lbsd). */ -#undef HAVE_LIBBSD - -/* Define to 1 if you have the `cap' library (-lcap). */ -#undef HAVE_LIBCAP - /* Define to 1 if you have the header file. */ #undef HAVE_LIBC_H -/* Define to 1 if you have the `dl' library (-ldl). */ -#undef HAVE_LIBDL - /* Define to 1 if you have the `gnumalloc' library (-lgnumalloc). */ #undef HAVE_LIBGNUMALLOC -/* Define to 1 if you have the `intl' library (-lintl). */ -#undef HAVE_LIBINTL - /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM /* Define to 1 if you have the `malloc' library (-lmalloc). */ #undef HAVE_LIBMALLOC -/* Define to 1 if you have the `md' library (-lmd). */ -#undef HAVE_LIBMD - -/* Define to 1 if you have the `md5' library (-lmd5). */ -#undef HAVE_LIBMD5 - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#undef HAVE_LIBNSL - /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `rt' library (-lrt). */ -#undef HAVE_LIBRT - -/* Define to 1 if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H diff -ruN squid-2.7.STABLE8/include/version.h squid-2.7.STABLE9/include/version.h --- squid-2.7.STABLE8/include/version.h 2010-03-10 01:41:19.000000000 +0100 +++ squid-2.7.STABLE9/include/version.h 2010-03-17 01:10:13.000000000 +0100 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1268181671 +#define SQUID_RELEASE_TIME 1268784602 #endif diff -ruN squid-2.7.STABLE8/lib/Makefile.in squid-2.7.STABLE9/lib/Makefile.in --- squid-2.7.STABLE8/lib/Makefile.in 2009-05-01 03:24:40.000000000 +0200 +++ squid-2.7.STABLE9/lib/Makefile.in 2010-03-14 21:27:25.000000000 +0100 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.92.2.3 2009/05/01 01:24:40 squidadm Exp $ +# $Id: Makefile.in,v 1.92.2.5 2010/03/14 20:27:25 squidadm Exp $ # VPATH = @srcdir@ @@ -40,8 +40,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in drand48.c \ inet_ntoa.c initgroups.c strerror.c tempnam.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -150,7 +150,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -162,6 +161,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/m4/ax_lib_socket_nsl.m4 squid-2.7.STABLE9/m4/ax_lib_socket_nsl.m4 --- squid-2.7.STABLE8/m4/ax_lib_socket_nsl.m4 1970-01-01 01:00:00.000000000 +0100 +++ squid-2.7.STABLE9/m4/ax_lib_socket_nsl.m4 2010-03-14 19:02:02.000000000 +0100 @@ -0,0 +1,40 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_SOCKET_NSL +# +# DESCRIPTION +# +# This macro figures out what libraries are required on this platform to +# link sockets programs. +# +# The common cases are not to need any extra libraries, or to need +# -lsocket and -lnsl. We need to avoid linking with libnsl unless we need +# it, though, since on some OSes where it isn't necessary it will totally +# break networking. Unisys also includes gethostbyname() in libsocket but +# needs libnsl for socket(). +# +# LICENSE +# +# Copyright (c) 2008 Russ Allbery +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Warren Young +# +# 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 6 + +AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL]) +AC_DEFUN([AX_LIB_SOCKET_NSL], +[ + AC_SEARCH_LIBS([gethostbyname], [nsl]) + AC_SEARCH_LIBS([socket], [socket], [], [ + AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], + [], [-lnsl])]) +]) diff -ruN squid-2.7.STABLE8/Makefile.am squid-2.7.STABLE9/Makefile.am --- squid-2.7.STABLE8/Makefile.am 2008-01-26 00:23:22.000000000 +0100 +++ squid-2.7.STABLE9/Makefile.am 2010-03-14 19:01:54.000000000 +0100 @@ -1,9 +1,10 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.20.6.1 2008/01/25 23:23:22 hno Exp $ +# $Id: Makefile.am,v 1.20.6.2 2010/03/14 18:01:54 hno Exp $ # AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 +ACLOCAL_AMFLAGS = -I m4 DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers tools SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers tools diff -ruN squid-2.7.STABLE8/Makefile.in squid-2.7.STABLE9/Makefile.in --- squid-2.7.STABLE8/Makefile.in 2009-05-01 03:23:59.000000000 +0200 +++ squid-2.7.STABLE9/Makefile.in 2010-03-14 21:27:03.000000000 +0100 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.56.2.2 2009/05/01 01:23:59 squidadm Exp $ +# $Id: Makefile.in,v 1.56.2.4 2010/03/14 20:27:03 squidadm Exp $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -42,8 +42,8 @@ cfgaux/compile cfgaux/config.guess cfgaux/config.sub \ cfgaux/depcomp cfgaux/install-sh cfgaux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -123,7 +123,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -135,6 +134,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -219,6 +219,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 +ACLOCAL_AMFLAGS = -I m4 DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers tools SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers tools DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* diff -ruN squid-2.7.STABLE8/RELEASENOTES.html squid-2.7.STABLE9/RELEASENOTES.html --- squid-2.7.STABLE8/RELEASENOTES.html 2010-03-10 01:41:49.000000000 +0100 +++ squid-2.7.STABLE9/RELEASENOTES.html 2010-03-17 01:11:25.000000000 +0100 @@ -1,13 +1,13 @@ - - Squid 2.7.STABLE8 release notes + + Squid 2.7.STABLE9 release notes -

Squid 2.7.STABLE8 release notes

+

Squid 2.7.STABLE9 release notes

-

Squid Developers

$Id: release.html,v 1.1.2.14 2010/03/07 21:12:08 hno Exp $ +

Squid Developers

$Id: release.html,v 1.1.2.15 2010/03/14 21:40:46 hno Exp $
This document contains the release notes for version 2.7 of Squid. Squid is a WWW Cache application developed by the Web Caching community. @@ -62,6 +62,9 @@

11. Key changes in squid-2.7.STABLE8

+

+

12. Key changes in squid-2.7.STABLE9

+

1. Key changes from squid 2.6

@@ -578,7 +581,20 @@

+

12. Key changes in squid-2.7.STABLE9

+

This release has portability fixes only. No change in functionality.

+

+

    +
  • OpenSSL related compilation issue on some systems introduced +in 2.7.STABLE8.
    • +
  • configure failed to detect certain system libraries on some +systems, resulting in compilation failures either in Squid or helpers.
    • +
  • See also the list of +squid-2.7.STABLE9 changes and the +ChangeLog file for details.
    • +
+

diff -ruN squid-2.7.STABLE8/scripts/Makefile.in squid-2.7.STABLE9/scripts/Makefile.in --- squid-2.7.STABLE8/scripts/Makefile.in 2009-05-01 03:24:41.000000000 +0200 +++ squid-2.7.STABLE9/scripts/Makefile.in 2010-03-14 21:27:26.000000000 +0100 @@ -41,8 +41,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/RunCache.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -103,7 +103,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -115,6 +114,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/snmplib/Makefile.in squid-2.7.STABLE9/snmplib/Makefile.in --- squid-2.7.STABLE8/snmplib/Makefile.in 2009-05-01 03:24:41.000000000 +0200 +++ squid-2.7.STABLE9/snmplib/Makefile.in 2010-03-14 21:27:26.000000000 +0100 @@ -35,8 +35,8 @@ subdir = snmplib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -112,7 +112,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -124,6 +123,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/src/auth/Makefile.in squid-2.7.STABLE9/src/auth/Makefile.in --- squid-2.7.STABLE8/src/auth/Makefile.in 2009-05-01 03:24:43.000000000 +0200 +++ squid-2.7.STABLE9/src/auth/Makefile.in 2010-03-14 21:27:29.000000000 +0100 @@ -35,8 +35,8 @@ subdir = src/auth DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,7 +124,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -136,6 +135,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -222,7 +222,7 @@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.44.2.1 2009/05/01 01:24:43 squidadm Exp $ +# $Id: Makefile.in,v 1.44.2.3 2010/03/14 20:27:29 squidadm Exp $ # AUTOMAKE_OPTIONS = subdir-objects EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a diff -ruN squid-2.7.STABLE8/src/fs/Makefile.in squid-2.7.STABLE9/src/fs/Makefile.in --- squid-2.7.STABLE8/src/fs/Makefile.in 2009-05-01 03:24:44.000000000 +0200 +++ squid-2.7.STABLE9/src/fs/Makefile.in 2010-03-14 21:27:30.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.47.2.1 2009/05/01 01:24:44 squidadm Exp $ +# $Id: Makefile.in,v 1.47.2.3 2010/03/14 20:27:30 squidadm Exp $ # @@ -42,8 +42,8 @@ subdir = src/fs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -156,7 +156,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -168,6 +167,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/src/Makefile.am squid-2.7.STABLE9/src/Makefile.am --- squid-2.7.STABLE8/src/Makefile.am 2008-01-02 16:50:39.000000000 +0100 +++ squid-2.7.STABLE9/src/Makefile.am 2010-03-14 21:25:55.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.66.2.1 2008/01/02 15:50:39 hno Exp $ +# $Id: Makefile.am,v 1.66.2.2 2010/03/14 20:25:55 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -276,7 +276,6 @@ @REPL_OBJS@ \ @STORE_OBJS@ \ @AUTH_OBJS@ \ - @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ @LIB_MALLOC@ \ diff -ruN squid-2.7.STABLE8/src/Makefile.in squid-2.7.STABLE9/src/Makefile.in --- squid-2.7.STABLE8/src/Makefile.in 2009-05-01 03:24:42.000000000 +0200 +++ squid-2.7.STABLE9/src/Makefile.in 2010-03-14 21:27:27.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.295.2.2 2009/05/01 01:24:42 squidadm Exp $ +# $Id: Makefile.in,v 1.295.2.4 2010/03/14 20:27:27 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -49,8 +49,8 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -264,7 +264,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -276,6 +275,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -553,7 +553,6 @@ @REPL_OBJS@ \ @STORE_OBJS@ \ @AUTH_OBJS@ \ - @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ @LIB_MALLOC@ \ diff -ruN squid-2.7.STABLE8/src/repl/Makefile.in squid-2.7.STABLE9/src/repl/Makefile.in --- squid-2.7.STABLE8/src/repl/Makefile.in 2009-05-01 03:24:44.000000000 +0200 +++ squid-2.7.STABLE9/src/repl/Makefile.in 2010-03-14 21:27:30.000000000 +0100 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.44.2.1 2009/05/01 01:24:44 squidadm Exp $ +# $Id: Makefile.in,v 1.44.2.3 2010/03/14 20:27:30 squidadm Exp $ # VPATH = @srcdir@ @@ -40,8 +40,8 @@ subdir = src/repl DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -120,7 +120,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -132,6 +131,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ diff -ruN squid-2.7.STABLE8/src/ssl_support.c squid-2.7.STABLE9/src/ssl_support.c --- squid-2.7.STABLE8/src/ssl_support.c 2010-03-07 16:59:18.000000000 +0100 +++ squid-2.7.STABLE9/src/ssl_support.c 2010-03-14 18:20:45.000000000 +0100 @@ -1,6 +1,6 @@ /* - * $Id: ssl_support.c,v 1.11.6.1 2010/03/07 15:59:18 hno Exp $ + * $Id: ssl_support.c,v 1.11.6.2 2010/03/14 17:20:45 hno Exp $ * * AUTHOR: Benno Rice * DEBUG: section 83 SSL accelerator support @@ -426,7 +426,11 @@ sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context) { int ssl_error; +#if OPENSSL_VERSION_NUMBER < 0x00909000L + SSL_METHOD *method; +#else const SSL_METHOD *method; +#endif SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); @@ -587,7 +591,11 @@ sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile) { int ssl_error; +#if OPENSSL_VERSION_NUMBER < 0x00909000L + SSL_METHOD *method; +#else const SSL_METHOD *method; +#endif SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); diff -ruN squid-2.7.STABLE8/tools/Makefile.in squid-2.7.STABLE9/tools/Makefile.in --- squid-2.7.STABLE8/tools/Makefile.in 2009-05-01 03:24:45.000000000 +0200 +++ squid-2.7.STABLE9/tools/Makefile.in 2010-03-14 21:27:30.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.16.2.1 2009/05/01 01:24:45 squidadm Exp $ +# $Id: Makefile.in,v 1.16.2.3 2010/03/14 20:27:30 squidadm Exp $ # # Uncomment and customize the following to suit your needs: # @@ -47,8 +47,8 @@ subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -148,7 +148,6 @@ LIBSASL = @LIBSASL@ LIB_DB = @LIB_DB@ LIB_EPOLL = @LIB_EPOLL@ -LIB_LBER = @LIB_LBER@ LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ @@ -160,6 +159,7 @@ MKDIR_P = @MKDIR_P@ MV = @MV@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@