bring in squid 2.6, this disables winbind as it is no longer part of squid... epoll is forced via configure so for anyone using 2.4, you might have an issue and need to disable that. let us know if this poses a problem. max fds was bumped to 4096 as well so as to not use the system defaults, that might need tweaked. please test.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@6895 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
pavlov
2007-04-08 17:03:20 +00:00
parent c47aad8b66
commit 9e522d42f7
5 changed files with 433 additions and 242 deletions

View File

@ -0,0 +1,229 @@
--- squid-2.6.STABLE12/configure 2007-03-20 16:35:44.000000000 -0500
+++ squid-2.6.STABLE12.NEW/configure 2007-04-08 11:49:42.000000000 -0500
@@ -4297,10 +4297,6 @@
if test -z "$SSLLIB"; then
SSLLIB="-lcrypto" # for MD5 routines
fi
- if $PKGCONFIG --exists openssl; then
- SSLLIB="`$PKGCONFIG --libs openssl`"
- SSLFLAGS="`$PKGCONFIG --cflags openssl`"
- fi
CPPFLAGS="${SSLFLAGS} $CPPFLAGS"
fi
@@ -8760,7 +8756,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9174,7 +9170,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9588,7 +9584,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10002,7 +9998,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10416,7 +10412,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10830,7 +10826,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10919,7 +10915,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -10992,7 +10988,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11065,7 +11061,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11138,7 +11134,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11211,7 +11207,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11284,7 +11280,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11357,7 +11353,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11430,7 +11426,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11503,7 +11499,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11576,7 +11572,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11649,7 +11645,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11722,7 +11718,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -11795,7 +11791,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16302,7 +16298,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16455,7 +16451,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16577,7 +16573,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16686,7 +16682,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16754,7 +16750,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (true); true; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */