afs: Pay attention to fetchOps->destroy error code
[openafs.git] / acinclude.m4
index 05a933f..272f0f5 100644 (file)
@@ -121,11 +121,12 @@ dnl Kernel module build options.
 AC_ARG_WITH([linux-kernel-headers],
     [AS_HELP_STRING([--with-linux-kernel-headers=path],
         [use the kernel headers found at path (optional, defaults to
-         /usr/src/linux-2.4, then /usr/src/linux)])])
+         /lib/modules/`uname -r`/build, then /lib/modules/`uname -r`/source,
+         then /usr/src/linux-2.4, and lastly /usr/src/linux)])])
 AC_ARG_WITH([linux-kernel-build],
     [AS_HELP_STRING([--with-linux-kernel-build=path],
        [use the kernel build found at path(optional, defaults to 
-       /usr/src/linux-2.4, then /usr/src/linux)])])
+       kernel headers path)])])
 AC_ARG_WITH([bsd-kernel-headers],
     [AS_HELP_STRING([--with-bsd-kernel-headers=path],
         [use the kernel headers found at path (optional, defaults to
@@ -161,6 +162,14 @@ AC_ARG_ENABLE([transarc-paths],
     , 
     [enable_transarc_paths="no"])
 
+dnl Deprecated crypto
+AC_ARG_ENABLE([kauth],
+    [AS_HELP_STRING([--disable-kauth],
+        [do not install the deprecated kauth server and utilities (defaults to
+         enabled)])],
+    ,
+    [enable_kauth="yes"])
+
 dnl Optimization and debugging flags.
 AC_ARG_ENABLE([strip-binaries],
     [AS_HELP_STRING([--disable-strip-binaries],
@@ -192,6 +201,11 @@ AC_ARG_ENABLE([checking],
         to disabled)])],
     [enable_checking="$enableval"],
     [enable_checking="no"])
+AC_ARG_ENABLE([debug-locks],
+    [AS_HELP_STRING([--enable-debug-locks],
+       [turn on lock debugging assertions (defaults to disabled)])],
+    [enable_debug_locks="$enableval"],
+    [enable_debug_locks="no"])
 AC_ARG_ENABLE([debug-kernel],
     [AS_HELP_STRING([--enable-debug-kernel],
         [enable compilation of the kernel module with debugging information
@@ -304,16 +318,20 @@ case $system in
                 if test "x$with_linux_kernel_headers" != "x"; then
                   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
                 else
-                  LINUX_KERNEL_PATH="/lib/modules/`uname -r`/source"
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/lib/modules/`uname -r`/build"
-                  fi
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/usr/src/linux-2.4"
-                  fi
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/usr/src/linux"
-                  fi
+                  for utsdir in "/lib/modules/`uname -r`/build" \
+                                "/lib/modules/`uname -r`/source" \
+                                "/usr/src/linux-2.4" \
+                                "/usr/src/linux"; do
+                    LINUX_KERNEL_PATH="$utsdir"
+                    for utsfile in "include/generated/utsrelease.h" \
+                                   "include/linux/utsrelease.h" \
+                                   "include/linux/version.h" \
+                                   "include/linux/version-up.h"; do
+                      if grep "UTS_RELEASE" "$utsdir/$utsfile" >/dev/null 2>&1; then
+                        break 2
+                      fi
+                    done
+                  done
                 fi
                 if test "x$with_linux_kernel_build" != "x"; then
                         LINUX_KERNEL_BUILD="$with_linux_kernel_build"
@@ -387,6 +405,7 @@ case $system in
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
+               SOLARIS_HAVE_VN_RENAMEPATH
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS
@@ -591,6 +610,14 @@ else
                        AFS_SYSNAME="x86_darwin_120"
                        OSXSDK="macosx10.8"
                        ;;
+                x86_64-apple-darwin13.*)
+                        AFS_SYSNAME="x86_darwin_130"
+                        OSXSDK="macosx10.9"
+                        ;;
+                i?86-apple-darwin13.*)
+                        AFS_SYSNAME="x86_darwin_130"
+                        OSXSDK="macosx10.9"
+                        ;;
                sparc-sun-solaris2.8)
                        AFS_SYSNAME="sun4x_58"
                        ;;
@@ -736,6 +763,7 @@ case $AFS_SYSNAME in
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
     *_nbsd50)   AFS_PARAM_COMMON=param.nbsd50.h  ;;
     *_nbsd60)   AFS_PARAM_COMMON=param.nbsd60.h  ;;
+    *_nbsd70)   AFS_PARAM_COMMON=param.nbsd70.h  ;;
     *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
     *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
     *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
@@ -754,6 +782,11 @@ case $AFS_SYSNAME in
     *_obsd46)   AFS_PARAM_COMMON=param.obsd46.h  ;;
     *_obsd47)   AFS_PARAM_COMMON=param.obsd47.h  ;;
     *_obsd48)   AFS_PARAM_COMMON=param.obsd48.h  ;;
+    *_obsd49)   AFS_PARAM_COMMON=param.obsd49.h  ;;
+    *_obsd50)   AFS_PARAM_COMMON=param.obsd50.h  ;;
+    *_obsd51)   AFS_PARAM_COMMON=param.obsd51.h  ;;
+    *_obsd52)   AFS_PARAM_COMMON=param.obsd52.h  ;;
+    *_obsd53)   AFS_PARAM_COMMON=param.obsd53.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -803,12 +836,14 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 
                 dnl Type existence checks
                 AC_CHECK_LINUX_TYPE([struct vfs_path], [dcache.h])
+                AC_CHECK_LINUX_TYPE([kuid_t], [uidgid.h])
 
                 dnl Check for structure elements
                 AC_CHECK_LINUX_STRUCT([address_space_operations],
                                       [write_begin], [fs.h])
                 AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
                                       [backing-dev.h])
+                AC_CHECK_LINUX_STRUCT([cred], [session_keyring], [cred.h])
                 AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
                 AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
@@ -817,8 +852,12 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_STRUCT([inode], [i_mutex], [fs.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
+                AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [instantiate_prep], [key-type.h])
                 AC_CHECK_LINUX_STRUCT([nameidata], [path], [namei.h])
                 AC_CHECK_LINUX_STRUCT([proc_dir_entry], [owner], [proc_fs.h])
                 AC_CHECK_LINUX_STRUCT([super_block], [s_bdi], [fs.h])
@@ -868,6 +907,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([d_alloc_anon],
                                     [#include <linux/fs.h>],
                                     [d_alloc_anon(NULL);])
+                AC_CHECK_LINUX_FUNC([d_count],
+                                    [#include <linux/dcache.h>],
+                                    [d_count(NULL);])
                 AC_CHECK_LINUX_FUNC([d_make_root],
                                     [#include <linux/fs.h>],
                                     [d_make_root(NULL);])
@@ -908,16 +950,18 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                     [#include <linux/fs.h>
                                      #include <linux/namei.h>],
                                     [path_lookup(NULL, 0, NULL);])
-                AC_CHECK_LINUX_FUNC([putname],
-                                    [#include <linux/fs.h>
-                                     #include <linux/namei.h>],
-                                    [putname(NULL);])
+                AC_CHECK_LINUX_FUNC([proc_create],
+                                    [#include <linux/proc_fs.h>],
+                                    [proc_create(NULL, 0, NULL, NULL);])
                 AC_CHECK_LINUX_FUNC([rcu_read_lock],
                                     [#include <linux/rcupdate.h>],
                                     [rcu_read_lock();])
                 AC_CHECK_LINUX_FUNC([set_nlink],
                                     [#include <linux/fs.h>],
                                     [set_nlink(NULL, 1);])
+                AC_CHECK_LINUX_FUNC([sock_create_kern],
+                                    [#include <linux/net.h>],
+                                    [sock_create_kern(0, 0, 0, NULL);])
                 AC_CHECK_LINUX_FUNC([splice_direct_to_actor],
                                     [#include <linux/splice.h>],
                                     [splice_direct_to_actor(NULL,NULL,NULL);])
@@ -988,6 +1032,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE
                 LINUX_DENTRY_OPEN_TAKES_PATH
                 LINUX_D_ALIAS_IS_HLIST
+                LINUX_HLIST_ITERATOR_NO_NODE
                 LINUX_IOP_I_CREATE_TAKES_BOOL
                 LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
                 LINUX_IOP_LOOKUP_TAKES_UNSIGNED
@@ -1301,13 +1346,13 @@ AC_CHECK_HEADERS([ \
                   arpa/nameser.h \
                   curses.h\
                   direct.h \
-                  et/com_err.h \
                   errno.h \
                   fcntl.h \
                   grp.h \
                   math.h \
                   mntent.h \
                   ncurses.h \
+                  ncurses/ncurses.h \
                   netdb.h \
                   netinet/in.h \
                   pthread_np.h \
@@ -1412,6 +1457,10 @@ AS_IF([test "x$enable_gtx" != "xno"],
        
 OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
+if test "$enable_debug_locks" = yes; then
+       AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr])
+fi
+
 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
@@ -1441,6 +1490,13 @@ else
 fi
 AC_SUBST(BUILD_USS)
 
+if test "$enable_kauth" = yes; then
+       INSTALL_KAUTH="yes"
+else
+       INSTALL_KAUTH="no"
+fi
+AC_SUBST(INSTALL_KAUTH)
+
 AC_CHECK_FUNCS([ \
        arc4random \
        fcntl \
@@ -1454,6 +1510,7 @@ AC_CHECK_FUNCS([ \
        getrlimit \
        issetugid \
        mkstemp \
+       poll \
        pread \
        preadv \
        preadv64 \
@@ -1887,6 +1944,11 @@ OPENAFS_HAVE_STRUCT_FIELD(DIR, dd_fd, [#include <sys/types.h>
 #include <dirent.h>
 #endif])
 
+OPENAFS_HAVE_STRUCT_FIELD(struct rusage, ru_idrss,
+[#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif])
+
 dnl Eventually, this will look for the system one, or for OpenSSL
 LIB_hcrypto="-lafshcrypto"
 LDFLAGS_hcrypto="-L\$(TOP_LIBDIR)"
@@ -1900,16 +1962,3 @@ AC_CHECK_FUNCS([uuid_generate])
 ])
 
 
-AC_DEFUN([SUMMARY], [
-    # Print a configuration summary
-echo 
-echo "**************************************"
-echo configure summary
-echo
-AS_IF([test $LIB_curses],[
-echo "LIB_curses :                $LIB_curses" ],[
-echo "XXX LIB_curses  not found! not building scout and afsmonitor!"
-])
-echo 
-echo "**************************************"
-])