Revision: 14416
Author: adrian.chadd
Date: Tue Feb 16 22:39:36 2010
Log: Try to fix build issues with Linux and capability.h .
Source:
http://ftp.riken.go.jp/pub/pub/Linux/gentoo/net-proxy/squid/files/squid-2-capability.patch
http://code.google.com/p/lusca-cache/source/detail?r=14416
Modified:
/branches/LUSCA_HEAD/configure.in
/branches/LUSCA_HEAD/src/tools.c
=======================================
--- /branches/LUSCA_HEAD/configure.in Fri Oct 30 00:52:22 2009
+++ /branches/LUSCA_HEAD/configure.in Tue Feb 16 22:39:36 2010
@@ -1687,7 +1687,6 @@
db.h \
db_185.h \
aio.h \
- sys/capability.h \
,,,[
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -1721,6 +1720,13 @@
#endif
])
+dnl Check for libcap header
+AC_ARG_ENABLE(caps,
+[ --disable-caps disable usage of Linux capabilities library to control
privileges])
+if test "x$enable_caps" != xno; then
+ AC_CHECK_HEADERS( sys/capability.h )
+fi
+
dnl Check for IP-Filter headers. These are a bit nasty..
AC_CHECK_HEADERS( \
ip_compat.h \
=======================================
--- /branches/LUSCA_HEAD/src/tools.c Wed Jul 8 15:28:20 2009
+++ /branches/LUSCA_HEAD/src/tools.c Tue Feb 16 22:39:36 2010
@@ -42,11 +42,6 @@
#ifdef _SQUID_LINUX_
#if HAVE_SYS_CAPABILITY_H
-#undef _POSIX_SOURCE
-/* Ugly glue to get around linux header madness colliding with glibc */
-#define _LINUX_TYPES_H
-#define _LINUX_FS_H
-typedef uint32_t __u32;
#include <sys/capability.h>
#endif
#endif
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
