Linux 4: struct address_space no longer has backing_dev_info
[openafs.git] / acinclude.m4
index 91231ba..84199ff 100644 (file)
@@ -14,7 +14,7 @@ AH_BOTTOM([
 #   include <sys/types.h>
 #   include <sys/param.h>
 #   if BYTE_ORDER == BIG_ENDIAN
-#   define WORDS_BIGENDIAN 1
+#    define WORDS_BIGENDIAN 1
 #   endif
 #  else
 #   if defined(AUTOCONF_FOUND_BIGENDIAN)
@@ -44,8 +44,8 @@ AH_BOTTOM([
  * need to define this when building for such interfaces, but set it always to
  * try and reduce potential confusion. 
  */
-#define _FILE_OFFSET_BITS 64
-#define AFS_CACHE_VNODE_PATH
+# define _FILE_OFFSET_BITS 64
+# define AFS_CACHE_VNODE_PATH
 #endif
 
 #undef AFS_NAMEI_ENV
@@ -62,7 +62,7 @@ AH_BOTTOM([
 /* glue for RedHat kernel bug */
 #undef ENABLE_REDHAT_BUILDSYS
 #if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX)
-#include "redhat-fix.h"
+# include "redhat-fix.h"
 #endif])
 
 AC_CANONICAL_HOST
@@ -72,115 +72,132 @@ SRCDIR_PARENT=`pwd`
 
 dnl System identity.
 AC_ARG_WITH([afs-sysname],
-    [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])])
+    [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])
+])
 
 dnl General feature options.
-AC_ARG_ENABLE([pam],
-    [AS_HELP_STRING([--disable-pam], [disable PAM support])],
-    ,
-    [enable_pam="yes"])
+AC_ARG_ENABLE([gtx],
+    [AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])])
+
 AC_ARG_ENABLE([namei-fileserver],
     [AS_HELP_STRING([--enable-namei-fileserver],
-        [force compilation of namei fileserver in preference to inode
-         fileserver])],
-    , 
+       [force compilation of namei fileserver in preference to inode
+        fileserver])],
+    [],
     [enable_namei_fileserver="default"])
 AC_ARG_ENABLE([supergroups],
     [AS_HELP_STRING([--enable-supergroups],
-        [enable support for nested pts groups])],
-    , 
+       [enable support for nested pts groups])],
+    [],
     [enable_supergroups="no"])
 AC_ARG_ENABLE([bitmap-later],
     [AS_HELP_STRING([--enable-bitmap-later],
         [enable fast startup of file server by not reading bitmap till
          needed])],
-    , 
+    [AS_IF([test x"$withval" = xyes],
+        [AC_MSG_WARN([bitmap-later is only used by non-demand-attach
+            fileservers.  Please migrate to demand-attach instead.])])],
     [enable_bitmap_later="no"])
 AC_ARG_ENABLE([unix-sockets],
     [AS_HELP_STRING([--disable-unix-sockets],
-        [disable use of unix domain sockets for fssync (defaults to enabled)])],
-    ,
+       [disable use of unix domain sockets for fssync (defaults to enabled)])],
+    [],
     [enable_unix_sockets="yes"])
 AC_ARG_ENABLE([tivoli-tsm],
     [AS_HELP_STRING([--enable-tivoli-tsm],
-        [enable use of the Tivoli TSM API libraries for butc support])],
-    , 
+       [enable use of the Tivoli TSM API libraries for butc support])],
+    [],
     [enable_tivoli_tsm="no"])
 AC_ARG_ENABLE([pthreaded-ubik],
-    [AS_HELP_STRING([--enable-pthreaded-ubik],
-        [enable installation of pthreaded ubik applications (defaults to
-         disabled)])],
-    ,
-    [enable_pthreaded_ubik="no"])
+    [AS_HELP_STRING([--disable-pthreaded-ubik],
+        [disable installation of pthreaded ubik applications (defaults to
+         enabled)])],
+    [],
+    [enable_pthreaded_ubik="yes"])
 
 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)])])
+       [use the kernel headers found at path (optional, defaults to
+        /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)])])
+       [use the kernel build found at path(optional, defaults to
+       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
-         /usr/src/sys)])])
+       [use the kernel headers found at path (optional, defaults to
+        /usr/src/sys)])
+])
 AC_ARG_WITH([bsd-kernel-build],
-    [AS_HELP_STRING([--with-bsd-kernel-build=path], 
-        [use the kernel build found at path (optional, defaults to
-         KSRC/i386/compile/GENERIC)])])
+    [AS_HELP_STRING([--with-bsd-kernel-build=path],
+       [use the kernel build found at path (optional, defaults to
+        KSRC/i386/compile/GENERIC)])
+])
 AC_ARG_WITH([linux-kernel-packaging],
     [AS_HELP_STRING([--with-linux-kernel-packaging],
-        [use standard naming conventions to aid Linux kernel build packaging
-         (disables MPS, sets the kernel module name to openafs.ko, and
-         installs kernel modules into the standard Linux location)])],
-    [AC_SUBST(LINUX_KERNEL_PACKAGING, "yes")
-     AC_SUBST(LINUX_LIBAFS_NAME, "openafs")],
-    [AC_SUBST(LINUX_LIBAFS_NAME, "libafs")])
+       [use standard naming conventions to aid Linux kernel build packaging
+        (disables MPS, sets the kernel module name to openafs.ko, and
+        installs kernel modules into the standard Linux location)])],
+    [AC_SUBST([LINUX_KERNEL_PACKAGING], [yes])
+     AC_SUBST([LINUX_LIBAFS_NAME], [openafs])],
+    [AC_SUBST([LINUX_LIBAFS_NAME], [libafs])
+])
 AC_ARG_ENABLE([kernel-module],
     [AS_HELP_STRING([--disable-kernel-module],
-        [disable compilation of the kernel module (defaults to enabled)])],
-    , 
+       [disable compilation of the kernel module (defaults to enabled)])],
+    [],
     [enable_kernel_module="yes"])
 AC_ARG_ENABLE([redhat-buildsys],
     [AS_HELP_STRING([--enable-redhat-buildsys],
-        [enable compilation of the redhat build system kernel (defaults to
-         disabled)])],
-    ,
+       [enable compilation of the redhat build system kernel (defaults to
+        disabled)])],
+    [],
     [enable_redhat_buildsys="no"])
 
 dnl Installation locations.
 AC_ARG_ENABLE([transarc-paths],
     [AS_HELP_STRING([--enable-transarc-paths],
-        [use Transarc style paths like /usr/afs and /usr/vice])],
-    , 
+       [use Transarc style paths like /usr/afs and /usr/vice])],
+    [],
     [enable_transarc_paths="no"])
 
+dnl Deprecated crypto
+AC_ARG_ENABLE([kauth],
+    [AS_HELP_STRING([--enable-kauth],
+        [install the deprecated kauth server, pam modules, and utilities
+         (defaults to disabled)])],
+    [enable_pam="yes"],
+    [enable_kauth="no"
+     enable_pam="no"])
+
 dnl Optimization and debugging flags.
 AC_ARG_ENABLE([strip-binaries],
     [AS_HELP_STRING([--disable-strip-binaries],
-        [disable stripping of symbol information from binaries (defaults to
-         enabled)])],
-    ,
+       [disable stripping of symbol information from binaries (defaults to
+        enabled)])],
+    [],
     [enable_strip_binaries="maybe"])
 AC_ARG_ENABLE([debug],
     [AS_HELP_STRING([--enable-debug],
-        [enable compilation of the user space code with debugging information
-         (defaults to disabled)])],
-    , 
+       [enable compilation of the user space code with debugging information
+        (defaults to disabled)])],
+    [],
     [enable_debug="no"])
 AC_ARG_ENABLE([optimize],
     [AS_HELP_STRING([--disable-optimize],
-        [disable optimization for compilation of the user space code (defaults
-         to enabled)])],
-    , 
+       [disable optimization for compilation of the user space code (defaults
+        to enabled)])],
+    [],
     [enable_optimize="yes"])
 AC_ARG_ENABLE([warnings],
     [AS_HELP_STRING([--enable-warnings],
-        [enable compilation warnings when building with gcc (defaults to
-         disabled)])],
-    ,
+       [enable compilation warnings when building with gcc (defaults to
+        disabled)])],
+    [],
     [enable_warnings="no"])
 AC_ARG_ENABLE([checking],
     [AS_HELP_STRING([--enable-checking],
@@ -188,56 +205,85 @@ 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
-         (defaults to disabled)])],
-    ,
+       [enable compilation of the kernel module with debugging information
+        (defaults to disabled)])],
+    [],
     [enable_debug_kernel="no"])
 AC_ARG_ENABLE([optimize-kernel],
     [AS_HELP_STRING([--disable-optimize-kernel],
-        [disable compilation of the kernel module with optimization (defaults
-         based on platform)])],
-    , 
+       [disable compilation of the kernel module with optimization (defaults
+        based on platform)])],
+    [],
     [enable_optimize_kernel=""])
 AC_ARG_ENABLE([debug-lwp],
     [AS_HELP_STRING([--enable-debug-lwp],
-        [enable compilation of the LWP code with debugging information
-         (defaults to disabled)])],
-    ,
+       [enable compilation of the LWP code with debugging information
+        (defaults to disabled)])],
+    [],
     [enable_debug_lwp="no"])
 AC_ARG_ENABLE([optimize-lwp],
     [AS_HELP_STRING([--disable-optimize-lwp],
-        [disable optimization for compilation of the LWP code (defaults to
-         enabled)])],
-    ,
+       [disable optimization for compilation of the LWP code (defaults to
+        enabled)])],
+    [],
     [enable_optimize_lwp="yes"])
 AC_ARG_ENABLE([debug-pam],
     [AS_HELP_STRING([--enable-debug-pam],
-        [enable compilation of the PAM code with debugging information
-         (defaults to disabled)])],
-    ,
+       [enable compilation of the PAM code with debugging information
+        (defaults to disabled)])],
+    [],
     [enable_debug_pam="no"])
 AC_ARG_ENABLE([optimize-pam],
     [AS_HELP_STRING([--disable-optimize-pam],
-        [disable optimization for compilation of the PAM code (defaults to
-         enabled)])],
-    ,
+       [disable optimization for compilation of the PAM code (defaults to
+        enabled)])],
+    [],
     [enable_optimize_pam="yes"])
 AC_ARG_ENABLE([linux-syscall-probing],
     [AS_HELP_STRING([--enable-linux-syscall-probing],
        [enable Linux syscall probing (defaults to autodetect)])],
-    ,
+    [],
     [enable_linux_syscall_probing="maybe"])
-    
+AC_ARG_ENABLE([linux-d_splice_alias-extra-iput],
+    [AS_HELP_STRING([--enable-linux-d_splice_alias-extra-iput],
+       [Linux has introduced an incompatible behavior change in the
+        d_splice_alias function with no reliable way to determine which
+        behavior will be produced.  If Linux commit
+        51486b900ee92856b977eacfc5bfbe6565028070 (or equivalent) has been
+        applied to your kernel, disable this option.  If that commit is
+        not present in your kernel, enable this option.  We apologize
+        that you are required to know this about your running kernel.])],
+    [],
+    [case $system in
+    *-linux*)
+       AS_IF([test "x$LOGNAME" != "xbuildslave" &&
+           test "x$LOGNAME" != "xbuildbot"],
+           [AC_ERROR([Linux users must specify either
+               --enable-linux-d_splice_alias-extra-iput or
+               --disable-linux-d_splice_alias-extra-iput])],
+           [enable_linux_d_splice_alias_extra_iput="no"])
+     esac
+    ])
+AC_ARG_WITH([crosstools-dir],
+    [AS_HELP_STRING([--with-crosstools-dir=path],
+       [use path for native versions of rxgen, compile_et and config])
+])
+
 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"],
-       AC_CHECK_PROGS([XSLTPROC], [libxslt saxon xalan-j xsltproc], [echo]))
+       [XSLTPROC="$withval"],
+       [AC_CHECK_PROGS([XSLTPROC], [libxslt saxon xalan-j xsltproc], [echo])])
 
-AC_ARG_WITH([html-xsl], 
-        AS_HELP_STRING([--with-html-xsl],
+AC_ARG_WITH([html-xsl],
+       AS_HELP_STRING([--with-html-xsl],
        [build HTML documentation using this stylesheet (default is html/chunk.dsl; specify either html/chunk.xsl or html/docbook.xsl)]),
        [HTML_XSL="$withval"],
        [HTML_XSL="html/chunk.xsl"])
@@ -245,28 +291,63 @@ AC_ARG_WITH([html-xsl],
 AC_ARG_WITH([docbook2pdf],
        AS_HELP_STRING([--with-docbook2pdf=ARG],
        [which Docbook to PDF utility to use (possible choices are: fop, dblatex, docbook2pdf)]),
-               [DOCBOOK2PDF="$withval"],
-       AC_CHECK_PROGS([DOCBOOK2PDF], [fop dblatex docbook2pdf], [echo]))
+       [DOCBOOK2PDF="$withval"],
+       [AC_CHECK_PROGS([DOCBOOK2PDF], [fop dblatex docbook2pdf], [echo])])
 
 AC_ARG_WITH([docbook-stylesheets],
        AS_HELP_STRING([--with-docbook-stylesheets=ARG],
        [location of DocBook stylesheets (default is to search a set of likely paths)]),
-               [DOCBOOK_STYLESHEETS="$withval"],
-       OPENAFS_SEARCH_DIRLIST([DOCBOOK_STYLESHEETS], [/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets /usr/share/sgml/docbook/docbook-xsl-stylesheets /usr/share/sgml/docbook/xsl-stylesheets /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl], [$HTML_XSL])
-       if test "x$DOCBOOK_STYLESHEETS" = "x"; then
-               AC_WARN([Docbook stylesheets not found; some documentation can't be built])
-       fi)
+       [DOCBOOK_STYLESHEETS="$withval"],
+       [OPENAFS_SEARCH_DIRLIST([DOCBOOK_STYLESHEETS],
+               [/usr/share/xml/docbook/stylesheet/nwalsh/current \
+                /usr/share/xml/docbook/stylesheet/nwalsh \
+                /usr/share/xml/docbook/xsl-stylesheets \
+                /usr/share/sgml/docbook/docbook-xsl-stylesheets \
+                /usr/share/sgml/docbook/xsl-stylesheets \
+                /usr/share/docbook-xsl \
+                /usr/share/sgml/docbkxsl \
+                /usr/local/share/xsl/docbook \
+                /sw/share/xml/xsl/docbook-xsl \
+                /opt/local/share/xsl/docbook-xsl],
+               [$HTML_XSL])
+          AS_IF([test "x$DOCBOOK_STYLESHEETS" = "x"],
+               [AC_WARN([Docbook stylesheets not found; some documentation can't be built])
+          ])
+       ])
+
+AC_ARG_WITH([dot],
+       AS_HELP_STRING([--with-dot@<:@=PATH@:>@],
+        [use graphviz dot to generate dependency graphs with doxygen (defaults to autodetect)]),
+        [], [with_dot="maybe"])
 
 enable_login="no"
 
 dnl Check whether kindlegen exists.  If not, we'll suppress that part of the
 dnl documentation build.
 AC_CHECK_PROGS([KINDLEGEN], [kindlegen])
+AC_CHECK_PROGS([DOXYGEN], [doxygen])
+
+dnl Optionally generate graphs with doxygen.
+case "$with_dot" in
+maybe)
+    AC_CHECK_PROGS([DOT], [dot])
+    AS_IF([test "x$DOT" = "x"], [HAVE_DOT="no"], [HAVE_DOT="yes"])
+    ;;
+yes)
+    HAVE_DOT="yes"
+    ;;
+no)
+    HAVE_DOT="no"
+    ;;
+*)
+    HAVE_DOT="yes"
+    DOT_PATH=$with_dot
+esac
+AC_SUBST(HAVE_DOT)
+AC_SUBST(DOT_PATH)
 
-dnl weird ass systems
-dnl AC_AIX
+dnl Checks for UNIX variants.
 AC_ISC_POSIX
-dnl AC_MINIX
 
 dnl Various compiler setup.
 AC_TYPE_PID_T
@@ -298,16 +379,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"
@@ -361,23 +446,31 @@ case $system in
                  SUBARCH=default
                fi
                AC_MSG_RESULT(linux)
+                GUESS_LINUX_VERSION=
                 if test "x$enable_kernel_module" = "xyes"; then
-                 case "$LINUX_VERSION" in
+                 GUESS_LINUX_VERSION=${LINUX_VERSION}
+                else
+                 GUESS_LINUX_VERSION=`uname -r`
+                fi
+                case "$GUESS_LINUX_VERSION" in
                   2.2.*) AFS_SYSKVERS=22 ;;
                   2.4.*) AFS_SYSKVERS=24 ;;
-                  2.6.* | 3.*) AFS_SYSKVERS=26 ;;
+                  [2.6.* | [3-9]* | [1-2][0-9]*]) AFS_SYSKVERS=26 ;;
                   *) AC_MSG_ERROR(Couldn't guess your Linux version [2]) ;;
-                 esac
-                fi
+                esac
                 ;;
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
                AC_PATH_PROG(SOLARISCC, [cc], ,
-                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin])
+                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin:/opt/solarisstudio12.3/bin:/opt/solstudio12.2/bin:/opt/sunstudio12.1/bin])
+               if test "x$SOLARISCC" = "x" ; then
+                   AC_MSG_FAILURE(Could not find the solaris cc program.  Please define the environment variable SOLARISCC to specify the path.)
+               fi
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
+               SOLARIS_HAVE_VN_RENAMEPATH
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS
@@ -470,13 +563,13 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="amd64_obsd${vM}${vm}"
                        ;;
-               i?86-*-freebsd?.*)
+               i?86-*-freebsd*.*)
                        v=${host#*freebsd}
                        vM=${v%.*}
                        vm=${v#*.}
                        AFS_SYSNAME="i386_fbsd_${vM}${vm}"
                        ;;
-               x86_64-*-freebsd?.*)
+               x86_64-*-freebsd*.*)
                        v=${host#*freebsd}
                        vM=${v%.*}
                        vm=${v#*.}
@@ -574,6 +667,30 @@ else
                        AFS_SYSNAME="x86_darwin_110"
                        OSXSDK="macosx10.7"
                        ;;
+               x86_64-apple-darwin12.*)
+                       AFS_SYSNAME="x86_darwin_120"
+                       OSXSDK="macosx10.8"
+                       ;;
+               i?86-apple-darwin12.*)
+                       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"
+                       ;;
+               x86_64-apple-darwin14.*)
+                       AFS_SYSNAME="x86_darwin_140"
+                       OSXSDK="macosx10.10"
+                       ;;
+               i?86-apple-darwin14.*)
+                       AFS_SYSNAME="x86_darwin_140"
+                       OSXSDK="macosx10.10"
+                       ;;
                sparc-sun-solaris2.8)
                        AFS_SYSNAME="sun4x_58"
                        ;;
@@ -586,10 +703,6 @@ else
                sparc-sun-solaris2.11)
                        AFS_SYSNAME="sun4x_511"
                        ;;
-               sparc-sun-sunos4*)
-                       AFS_SYSNAME="sun4_413"
-                       enable_login="yes"
-                       ;;
                i386-pc-solaris2.8)
                        AFS_SYSNAME="sunx86_58"
                        ;;
@@ -613,6 +726,7 @@ else
                        ;;
                mips-sgi-irix6.5)
                        AFS_SYSNAME="sgi_65"
+                       enable_pam="no"
                        ;;
                ia64-*-linux*)
                        AFS_SYSNAME="ia64_linuxXX"
@@ -723,6 +837,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  ;;
@@ -741,6 +856,12 @@ 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  ;;
+    *_obsd54)   AFS_PARAM_COMMON=param.obsd54.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -748,6 +869,7 @@ case $AFS_SYSNAME in
     *_linux_22) AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux_24) AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux_26) AFS_PARAM_COMMON=param.linux26.h ;;
+    *_fbsd_*)   AFS_PARAM_COMMON=param.generic_fbsd.h ;;
 esac
 
 OPENAFS_OSCONF
@@ -788,20 +910,36 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_HEADER([semaphore.h])
                 AC_CHECK_LINUX_HEADER([seq_file.h])
 
+                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], [backing_dev_info], [fs.h])
                 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], [d_u.d_alias], [dcache.h])
+                AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.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_STRUCT([inode], [i_mutex], [fs.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
+                AC_CHECK_LINUX_STRUCT([file], [f_path], [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], [read_iter], [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], [instantiate_prep], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [match_preparse], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([msghdr], [msg_iter], [socket.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])
@@ -841,6 +979,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 #include <linux/page-flags.h>],
                                     [struct page *_page;
                                       int bchecked = PageFsMisc(_page);])
+                AC_CHECK_LINUX_FUNC([clear_inode],
+                                    [#include <linux/fs.h>],
+                                    [clear_inode(NULL);])
                 AC_CHECK_LINUX_FUNC([current_kernel_time],
                                     [#include <linux/time.h>],
                                     [struct timespec s;
@@ -848,6 +989,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);])
@@ -866,12 +1010,18 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([hlist_unhashed],
                                     [#include <linux/list.h>],
                                     [hlist_unhashed(0);])
+                AC_CHECK_LINUX_FUNC([ihold],
+                                    [#include <linux/fs.h>],
+                                    [ihold(NULL);])
                 AC_CHECK_LINUX_FUNC([i_size_read],
                                     [#include <linux/fs.h>],
                                     [i_size_read(NULL);])
                 AC_CHECK_LINUX_FUNC([inode_setattr],
                                     [#include <linux/fs.h>],
                                     [inode_setattr(NULL, NULL);])
+                AC_CHECK_LINUX_FUNC([iter_file_splice_write],
+                                    [#include <linux/fs.h>],
+                                    [iter_file_splice_write(NULL,NULL,NULL,0,0);])
                 AC_CHECK_LINUX_FUNC([kernel_setsockopt],
                                     [#include <linux/net.h>],
                                     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
@@ -888,12 +1038,18 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                     [#include <linux/fs.h>
                                      #include <linux/namei.h>],
                                     [path_lookup(NULL, 0, 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);])
@@ -906,6 +1062,10 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([noop_fsync],
                                     [#include <linux/fs.h>],
                                     [void *address = &noop_fsync; printk("%p\n", address)];)
+                AC_CHECK_LINUX_FUNC([kthread_run],
+                                    [#include <linux/kernel.h>
+                                     #include <linux/kthread.h>],
+                                    [kthread_run(NULL, NULL, "test");])
 
                 dnl Consequences - things which get set as a result of the
                 dnl                above tests
@@ -914,6 +1074,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                  [define to disable the nfs translator])])
 
                 dnl Assorted more complex tests
+                LINUX_AIO_NONVECTOR
                 LINUX_EXPORTS_PROC_ROOT_FS
                  LINUX_KMEM_CACHE_INIT
                 LINUX_HAVE_KMEM_CACHE_T
@@ -955,6 +1116,15 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_D_COUNT_IS_INT
                 LINUX_IOP_MKDIR_TAKES_UMODE_T
                 LINUX_IOP_CREATE_TAKES_UMODE_T
+                LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES
+                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
+                LINUX_D_INVALIDATE_IS_VOID
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1033,6 +1203,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 fi
                 :
                fi
+               if test "x$enable_linux_d_splice_alias_extra_iput" = xyes; then
+                   AC_DEFINE(D_SPLICE_ALIAS_LEAK_ON_ERROR, 1, [for internal use])
+               fi
 dnl Linux-only, but just enable always.
                AC_DEFINE(AFS_CACHE_BYPASS, 1, [define to activate cache bypassing Unix client])
 esac
@@ -1125,8 +1298,8 @@ setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));],
        [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])])
+      [AC_DEFINE([HAVE_SETSOCKOPT_IP_RECVERR], [1],
+                [define if we can receive socket errors via IP_RECVERR])])
 
 PTHREAD_LIBS=error
 if test "x$MKAFS_OSTYPE" = OBSD; then
@@ -1197,10 +1370,6 @@ else
 fi
 AC_SUBST(USE_UNIX_SOCKETS)
 
-dnl if test "$ac_cv_setsockopt_iprecverr" = "yes"; then
-dnl    AC_DEFINE(ADAPT_PMTU, 1, [define if you want to decode icmp unreachable packets to discover path mtu])
-dnl fi
-
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
        VFSCK=""
@@ -1269,13 +1438,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 \
@@ -1368,28 +1537,24 @@ dnl see what struct stat has for timestamps
 AC_CHECK_MEMBERS([struct stat.st_ctimespec, struct stat.st_ctimensec])
 
 dnl check for curses-lib
-save_LIBS=$LIBS
-AC_CHECK_LIB( [ncurses], [setupterm],
-[LIB_curses=-lncurses],
-    [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses],
-        [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])
-    ])
-])
-LIBS=$save_LIBS
-AC_SUBST(LIB_curses)
-
+AS_IF([test "x$enable_gtx" != "xno"],
+      [save_LIBS=$LIBS
+      AC_CHECK_LIB( [ncurses], [setupterm],
+      [LIB_curses=-lncurses],
+        [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses],
+          [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])])
+      ])
+      LIBS=$save_LIBS
+      AC_SUBST(LIB_curses)])
+       
 OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
-dnl Don't build PAM on IRIX; the interface doesn't work for us.
+if test "$enable_debug_locks" = yes; then
+       AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr])
+fi
+
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
-        case $AFS_SYSNAME in
-        sgi_*)
-                HAVE_PAM="no"
-                ;;
-        *)
-               HAVE_PAM="yes"
-                ;;
-        esac
+       HAVE_PAM="YES"
 else
        HAVE_PAM="no"
 fi
@@ -1402,6 +1567,13 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
+if test "$enable_kauth" = yes; then
+       INSTALL_KAUTH="yes"
+else
+       INSTALL_KAUTH="no"
+fi
+AC_SUBST(INSTALL_KAUTH)
+
 AC_CHECK_FUNCS([ \
        arc4random \
        fcntl \
@@ -1412,10 +1584,10 @@ AC_CHECK_FUNCS([ \
        geteuid \
        getgid \
        getuid \
-       getprogname \
        getrlimit \
        issetugid \
        mkstemp \
+       poll \
        pread \
        preadv \
        preadv64 \
@@ -1426,17 +1598,18 @@ AC_CHECK_FUNCS([ \
        regerror \
        regexec \
        setitimer \
-       setprogname \
        setvbuf \
        sigaction \
        strcasestr \
        strerror \
        sysconf \
        sysctl \
+       tdestroy \
        timegm \
 ])
 
 OPENAFS_ROKEN()
+OPENAFS_HCRYPTO()
 OPENAFS_C_ATTRIBUTE()
 
 dnl Functions that Heimdal's libroken provides, but that we
@@ -1447,8 +1620,6 @@ AC_CHECK_FUNCS([ \
        gethostname \
        lstat \
        inet_aton \
-       inet_ntop \
-       inet_pton \
        putenv \
        readv \
        setenv \
@@ -1478,13 +1649,20 @@ AC_REPLACE_FUNCS([ \
        err \
        errx \
        flock \
+       freeaddrinfo \
+       gai_strerror \
+       getaddrinfo \
        getdtablesize \
+       getnameinfo \
        getopt \
        getprogname \
        gettimeofday \
+       inet_ntop \
+       inet_pton \
        localtime_r \
        mkstemp \
        setenv \
+       setprogname \
        strcasecmp \
        strlcat \
        strnlen \
@@ -1784,6 +1962,24 @@ if test "${DEST}x" = "x"; then
         DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
 fi
 
+if test "x$with_crosstools_dir" != "x"; then
+       if test -f "$with_crosstools_dir/rxgen" -a -f "$with_crosstools_dir/compile_et" -a -f "$with_crosstools_dir/config"; then
+               COMPILE_ET_PATH=$with_crosstools_dir/compile_et
+               CONFIGTOOL_PATH=$with_crosstools_dir/config
+               RXGEN_PATH=$with_crosstools_dir/rxgen
+       else
+               AC_MSG_ERROR(Tools not found in $with_crosstools_dir)
+               exit 1
+       fi
+else
+       COMPILE_ET_PATH="${SRCDIR_PARENT}/src/comerr/compile_et"
+       CONFIGTOOL_PATH="${SRCDIR_PARENT}/src/config/config"
+       RXGEN_PATH="${SRCDIR_PARENT}/src/rxgen/rxgen"
+fi
+AC_SUBST(COMPILE_ET_PATH)
+AC_SUBST(CONFIGTOOL_PATH)
+AC_SUBST(RXGEN_PATH)
+
 HELPER_SPLINT="${TOP_SRCDIR}/helper-splint.sh"
 HELPER_SPLINTCFG="${TOP_SRCDIR}/splint.cfg"
 AC_SUBST(HELPER_SPLINT)
@@ -1830,23 +2026,15 @@ OPENAFS_HAVE_STRUCT_FIELD(DIR, dd_fd, [#include <sys/types.h>
 #include <dirent.h>
 #endif])
 
-dnl Eventually, this will look for the system one, or for OpenSSL
-LIB_hcrypto="-lafshcrypto"
-LDFLAGS_hcrypto="-L\$(TOP_LIBDIR)"
-AC_SUBST(LIB_hcrypto)
-AC_SUBST(LDFLAGS_hcrypto)
-])
+OPENAFS_HAVE_STRUCT_FIELD(struct rusage, ru_idrss,
+[#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif])
 
-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 "**************************************"
+dnl Check for UUID library
+AC_CHECK_HEADERS([uuid/uuid.h])
+AC_CHECK_LIB(uuid, uuid_generate, LIBS_uuid="-luuid")
+AC_CHECK_FUNCS([uuid_generate])
 ])
+
+