,
[enable_optimize_pam="yes"])
AC_ARG_ENABLE([linux-syscall-probing],
- [AS_HELP_STRING([--disable-linux-syscall-probing],
- [disabling Linux syscall probing (defaults to enabled)])],
+ [AS_HELP_STRING([--enable-linux-syscall-probing],
+ [enable Linux syscall probing (defaults to autodetect)])],
,
- [AC_DEFINE(ENABLE_LINUX_SYSCALL_PROBING, 1,
- [define to enable syscall table probes])])
+ [enable_linux_syscall_probing="maybe"])
AC_ARG_WITH([xslt-processor],
[write_begin], [fs.h])
AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
[backing-dev.h])
+ AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h])
AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h])
AC_CHECK_LINUX_FUNC([bdi_init],
[#include <linux/backing-dev.h>],
[bdi_init(NULL);])
- AC_CHECK_LINUX_FUNC([ctl_table], [ctl_name], [sysctl.h])
+ AC_CHECK_LINUX_FUNC([PageChecked],
+ [#include <linux/mm.h>
+#include <linux/page-flags.h>],
+ [struct page *_page;
+ int bchecked = PageChecked(_page);])
+ AC_CHECK_LINUX_FUNC([PageFsMisc],
+ [#include <linux/mm.h>
+#include <linux/page-flags.h>],
+ [struct page *_page;
+ int bchecked = PageFsMisc(_page);])
AC_CHECK_LINUX_FUNC([current_kernel_time],
[#include <linux/time.h>],
[struct timespec s;
AC_CHECK_LINUX_FUNC([svc_addr_in],
[#include <linux/sunrpc/svc.h>],
[svc_addr_in(NULL);])
- AC_CHECK_LINUX_FUNC([vfs_llseek],
- [#include <linux/fs.h>],
- [vfs_llseek(NULL, 0, 0);])
AC_CHECK_LINUX_FUNC([zero_user_segments],
[#include <linux/highmem.h>],
[zero_user_segments(NULL, 0, 0, 0, 0);])
LINUX_KEY_ALLOC_NEEDS_CRED
LINUX_INIT_WORK_HAS_DATA
LINUX_REGISTER_SYSCTL_TABLE_NOFLAG
- LINUX_EXPORTS_INIT_MM
- LINUX_EXPORTS_SYS_CHDIR
- LINUX_EXPORTS_SYS_OPEN
+
+ dnl If we are guaranteed that keyrings will work - that is
+ dnl a) The kernel has keyrings enabled
+ dnl b) The code is new enough to give us a key_type_keyring
+ dnl then we just disable syscall probing unless we've been
+ dnl told otherwise
+
+ AS_IF([test "$enable_linux_syscall_probing" = "maybe"],
+ [AS_IF([test "$ac_cv_linux_keyring_support" = "yes" -a "$ac_cv_linux_exports_key_type_keyring" = "yes"],
+ [enable_linux_syscall_probing="no"],
+ [enable_linux_syscall_probing="yes"])
+ ])
+
+ dnl Syscall probing needs a few tests of its own, and just
+ dnl won't work if the kernel doesn't export init_mm
+ AS_IF([test "$enable_linux_syscall_probing" = "yes"], [
+ LINUX_EXPORTS_INIT_MM
+ AS_IF([test "$ac_cv_linux_exports_init_mm" = "no"], [
+ AC_MSG_ERROR(
+ [Can't do syscall probing without exported init_mm])
+ ])
+ LINUX_EXPORTS_SYS_CHDIR
+ LINUX_EXPORTS_SYS_OPEN
+ AC_DEFINE(ENABLE_LINUX_SYSCALL_PROBING, 1,
+ [define to enable syscall table probes])
+ ])
dnl Packaging and SMP build
if test "x$with_linux_kernel_packaging" = "xno" ; then
dnl Syscall probing
if test "x$ac_cv_linux_config_modversions" = "xno" -o $AFS_SYSKVERS -ge 26; then
- AC_MSG_WARN([Cannot determine sys_call_table status. assuming it isn't exported])
+ AS_IF([test "$enable_linux_syscall_probing" = "yes"], [
+ AC_MSG_WARN([Cannot determine sys_call_table status. assuming it isn't exported])
+ ])
ac_cv_linux_exports_sys_call_table=no
if test -f "$LINUX_KERNEL_PATH/include/asm/ia32_unistd.h"; then
ac_cv_linux_exports_ia32_sys_call_table=yes
fi
esac
-AC_CACHE_VAL(ac_cv_sockaddr_len,
-[
-AC_MSG_CHECKING([if struct sockaddr has sa_len field])
-AC_TRY_COMPILE( [#include <sys/types.h>
+AC_CACHE_CHECK([if struct sockaddr has sa_len field],
+ [ac_cv_sockaddr_len],
+ [AC_TRY_COMPILE( [#include <sys/types.h>
#include <sys/socket.h>],
-[struct sockaddr *a;
-a->sa_len=0;], ac_cv_sockaddr_len=yes, ac_cv_sockaddr_len=no)
-AC_MSG_RESULT($ac_cv_sockaddr_len)])
-if test "$ac_cv_sockaddr_len" = "yes"; then
- AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1, [define if you struct sockaddr sa_len])
-fi
+ [struct sockaddr *a; a->sa_len=0;],
+ [ac_cv_sockaddr_len=yes],
+ [ac_cv_sockaddr_len=no])
+])
+AS_IF([test "$ac_cv_sockaddr_len" = "yes"],
+ [AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1,
+ [define if you struct sockaddr sa_len])])
+
if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
echo Skipping library tests because they confuse Irix.
else
AC_CHECK_RESOLV_RETRANS
-AC_CACHE_VAL(ac_cv_setsockopt_iprecverr,
-[
-AC_MSG_CHECKING([for setsockopt(, SOL_IP, IP_RECVERR)])
-AC_TRY_COMPILE( [#include <sys/types.h>
+AC_CACHE_CHECK([for setsockopt(, SOL_IP, IP_RECVERR)],
+ [ac_cv_setsockopt_iprecverr],
+ [AC_TRY_COMPILE( [
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>],
[int on=1;
-setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));], ac_cv_setsockopt_iprecverr=yes, ac_cv_setsockopt_iprecverr=no)
-AC_MSG_RESULT($ac_cv_setsockopt_iprecverr)])
-if test "$ac_cv_setsockopt_iprecverr" = "yes"; then
- AC_DEFINE(ADAPT_PMTU_RECVERR, 1, [define if asynchronous socket errors can be received])
-fi
+setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));],
+ [ac_cv_setsockopt_iprecverr=yes],
+ [ac_cv_setsockopt_iprecverr=no])])
+
+AS_IF([test "$ac_cv_setsockopt_iprecverr" = "yes"],
+ [AC_DEFINE(ADAPT_PMTU_RECVERR, 1,
+ [define if asynchronous socket errors can be received])])
PTHREAD_LIBS=error
if test "x$MKAFS_OSTYPE" = OBSD; then
BSD_KERNEL_BUILD="$with_bsd_kernel_build"
else
case $AFS_SYSNAME in
- *_fbsd_4?)
- BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
- ;;
*_fbsd_*)
BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC"
;;
AC_CHECK_SIZEOF(unsigned int)
AC_TYPE_INTPTR_T
AC_TYPE_UINTPTR_T
-AC_CHECK_TYPES([ssize_t])
-AC_CHECK_TYPES([sig_atomic_t],[],[],
+AC_TYPE_SSIZE_T
+AC_CHECK_TYPE([sig_atomic_t],[],
+ [AC_DEFINE([sig_atomic_t], [int],
+ [Define to int if <signal.h> does not define.])],
[#include <sys/types.h>
#include <signal.h>])
-AC_CHECK_TYPES([socklen_t],[],[],
+AC_CHECK_TYPE([socklen_t],[],
+ [AC_DEFINE([socklen_t], [int],
+ [Define to int if <sys/socket.h> does not define.])],
[#include <sys/types.h>
#include <sys/socket.h>])
AC_SIZEOF_TYPE(long)