linux-allow-disabling-syscall-probing-20090602

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 1d12f45..9646ef6 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -299,7 +299,25 @@ AC_ARG_ENABLE([optimize-pam],
          enabled)])],
     ,
     [enable_optimize_pam="yes"])
-
+AC_ARG_ENABLE([linux-syscall-probing],
+    [AS_HELP_STRING([--disable-linux-syscall-probing],
+       [disabling Linux syscall probing (defaults to enabled)])],
+    ,
+    [AC_DEFINE(ENABLE_LINUX_SYSCALL_PROBING, 1, 
+       [define to enable syscall table probes])])
+    
+
+AC_ARG_WITH([xslt-processor],
+       AS_HELP_STRING([--with-xslt-processor=ARG],
+       [which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]),
+               XSLTPROC="$withval",
+               XSLTPROC="libxslt")
+
+AC_ARG_WITH([html-xsl], 
+        AS_HELP_STRING([--with-html-xsl],
+       [build HTML documentation using Norman Walsh's DocBook XSL stylesheets (default is no; specify a path to chunk.xsl or docbook.xsl)]),
+       HTML_XSL="$withval",
+       HTML_XSL=no)
 
 enable_login="no"
 
@@ -885,6 +903,8 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_KERNEL_LINUX_SYSCALL_H
                 LINUX_KERNEL_LINUX_SEQ_FILE_H
                 LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG
+                LINUX_POSIX_TEST_LOCK_RETURNS_CONFLICT
+                LINUX_POSIX_TEST_LOCK_CONFLICT_ARG
                 LINUX_KERNEL_SELINUX
                 LINUX_KERNEL_SOCK_CREATE
                 LINUX_KERNEL_PAGE_FOLLOW_LINK
@@ -1458,20 +1478,26 @@ fi
 
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+       VFSCK=""
 else
        if test "$enable_namei_fileserver" = "default"; then
                case $host in
                        *-solaris2.10*)
                                AC_MSG_WARN(Some Solaris 10 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *-solaris2.11*)
                                AC_MSG_WARN(Solaris 11 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *)
+                               VFSCK="vfsck"
                                ;;
                esac
+        else
+               VFSCK="vfsck"
        fi
 fi
 
@@ -1523,9 +1549,22 @@ AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h sys/fstyp.h)
 AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h poll.h sys/pag.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
-AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.h)
+AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.h sys/statvfs.h sys/statfs.h sys/bitypes.h)
 AC_CHECK_HEADERS(linux/errqueue.h,,,[#include <linux/types.h>])
 
+AC_CHECK_TYPES([fsblkcnt_t],,,[
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+])
+
 dnl Don't build PAM on IRIX; the interface doesn't work for us.
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
         case $AFS_SYSNAME in
@@ -1633,6 +1672,7 @@ if test "x$enable_pthreaded_ubik" = "xyes"; then
 ENABLE_PTHREADED_UBIK=yes
 fi
 
+AC_SUBST(VFSCK)
 AC_SUBST(AFS_SYSNAME)
 AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
@@ -1652,6 +1692,8 @@ AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(DARWIN_INFOFILE)
 AC_SUBST(IRIX_BUILD_IP35)
+AC_SUBST(HTML_XSL)
+AC_SUBST(XSLTPROC)
 
 OPENAFS_OSCONF
 OPENAFS_KRB5CONF