- up to 2.7.STABLE4

[packages/squid.git] / squid-libnsl_fixes.patch

diff --git a/squid-libnsl_fixes.patch b/squid-libnsl_fixes.patch
index 99c912631d4f23203affff66357c4fb1782b202a..3a57796ef4ebc1ed9cb8421b569ed01d8e86ba25 100644 (file)
--- a/squid-libnsl_fixes.patch
+++ b/squid-libnsl_fixes.patch
@@ -1,5 +1,6 @@
---- ./configure.in.org 2006-12-03 22:02:15.000000000 +0000
-+++ ./configure.in     2006-12-03 22:04:56.000000000 +0000
+diff -urN squid-2.7.STABLE4.orig/configure.in squid-2.7.STABLE4/configure.in
+--- squid-2.7.STABLE4.orig/configure.in        2008-08-08 21:21:03.000000000 +0200
++++ squid-2.7.STABLE4/configure.in     2008-09-18 12:42:51.646184400 +0200
 @@ -29,6 +29,7 @@
  
  
@@ -8,7 +9,7 @@
  REGEXLIB=''   # -lregex
  LIBREGEX=''   # libregex.a
  
-@@ -2011,8 +2012,10 @@
+@@ -2043,8 +2044,10 @@
   fi
  
  dnl Check for needed libraries
@@ -18,11 +19,12 @@
 +AC_CHECK_LIB(nsl, yp_match, NSLLIB="-lnsl")
 +AC_SUBST(NSLLIB)
 +AC_SEARCH_LIBS(socket, socket)
- AC_MSG_CHECKING(for winsock)
- save_LIBS="$LIBS"
- for curlib in ws2_32 wsock32; do
---- ./helpers/basic_auth/YP/Makefile.am.org    2005-05-17 16:56:26.000000000 +0000
-+++ ./helpers/basic_auth/YP/Makefile.am        2006-12-03 22:06:20.000000000 +0000
+ dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
+       case "$host_os" in
+       mingw|mingw32)
+diff -urN squid-2.7.STABLE4.orig/helpers/basic_auth/YP/Makefile.am squid-2.7.STABLE4/helpers/basic_auth/YP/Makefile.am
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/YP/Makefile.am   2005-05-17 18:56:26.000000000 +0200
++++ squid-2.7.STABLE4/helpers/basic_auth/YP/Makefile.am        2008-09-18 12:44:11.039717339 +0200
 @@ -7,5 +7,5 @@
  
  libexec_PROGRAMS = yp_auth