Add POD links (L<>) in pts.pod and symlink.pod
[openafs.git] / acinclude.m4
index d46dbb5..275bc22 100644 (file)
@@ -5,13 +5,8 @@ dnl NB: Because this code is a macro, references to positional shell
 dnl parameters must be done like $[]1 instead of $1
 
 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
-AH_VERBATIM([RCSID],
-[#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-#undef HAVE_CONNECT
-#undef HAVE_GETHOSTBYNAME
-#undef HAVE_RES_SEARCH
-#undef HAVE_SOCKET
+AH_VERBATIM([OPENAFS_HEADER],
+[#undef HAVE_RES_SEARCH
 #undef STRUCT_SOCKADDR_HAS_SA_LEN
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
 # if ENDIANESS_IN_SYS_PARAM_H
@@ -41,14 +36,22 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # else
 #  undef WORDS_BIGENDIAN
 # endif
-#endif])
+#endif
+#ifdef UKERNEL
+/*
+ * Always use 64-bit file offsets for UKERNEL code. Needed for UKERNEL stuff to
+ * play nice with some other interfaces like FUSE. We technically only would
+ * need to define this when building for such interfaces, but set it always to
+ * try and reduce potential confusion. 
+ */
+#define _FILE_OFFSET_BITS 64
+#endif
 
 #undef AFS_AFSDB_ENV
 #undef AFS_LARGEFILE_ENV
 #undef AFS_NAMEI_ENV
 #undef BITMAP_LATER
 #undef BOS_RESTRICTED_MODE
-#undef BOS_NEW_CONFIG
 #undef FAST_RESTART
 #undef FULL_LISTVOL_SWITCH
 #undef COMPLETION_H_EXISTS
@@ -81,7 +84,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #undef ENABLE_REDHAT_BUILDSYS
 #if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX)
 #include "redhat-fix.h"
-#endif
+#endif])
 
 AC_CANONICAL_HOST
 SRCDIR_PARENT=`pwd`
@@ -107,11 +110,6 @@ AC_ARG_ENABLE([bos-restricted-mode],
          functionality])],
     , 
     [enable_bos_restricted_mode="no"])
-AC_ARG_ENABLE([bos-new-config],
-    [AS_HELP_STRING([--enable-bos-new-config],
-        [enable bosserver pickup of BosConfig.new on restarts])],
-    ,
-    [enable_bos_new_config="no"])
 AC_ARG_ENABLE([largefile-fileserver],
     [AS_HELP_STRING([--disable-largefile-fileserver],
         [disable large file support in fileserver])],
@@ -180,12 +178,6 @@ AC_ARG_ENABLE([pthreaded-ubik],
          disabled)])],
     ,
     [enable_pthreaded_ubik="no"])
-AC_ARG_ENABLE([linux-fh],
-    [AS_HELP_STRING([--enable-linux-fh],
-        [enable opening cache files by file hande instead of inode numbers
-         with linux (defaults to disabled)])],
-    ,
-    [enable_linux_fh="no"])
 
 dnl Kernel module build options.
 AC_ARG_WITH([dux-kernel-headers],
@@ -260,6 +252,12 @@ AC_ARG_ENABLE([warnings],
          disabled)])],
     ,
     [enable_warnings="no"])
+AC_ARG_ENABLE([checking],
+    [AS_HELP_STRING([--enable-checking],
+       [turn compilation warnings into errors when building with gcc (defaults
+        to disabled)])],
+    [enable_checking="$enableval"],
+    [enable_checking="no"])
 AC_ARG_ENABLE([debug-kernel],
     [AS_HELP_STRING([--enable-debug-kernel],
         [enable compilation of the kernel module with debugging information
@@ -296,7 +294,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"
 
@@ -308,7 +324,6 @@ dnl AC_MINIX
 dnl Various compiler setup.
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 COMPILER_HAS_FUNCTION_MACRO
 
 dnl Checks for programs.
@@ -404,6 +419,7 @@ case $system in
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_PROC_HAS_P_COREFILE
                SOLARIS_FS_HAS_FS_ROLLED
+               SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS
@@ -440,18 +456,30 @@ case $system in
                MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(x86_darwin)
                 ;;
-       *-freebsd*)
+       i386-*-freebsd*)
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
                ;;
+       x86_64-*-freebsd*)
+               MKAFS_OSTYPE=FBSD
+               AC_MSG_RESULT(amd64_fbsd)
+               ;;
        *-netbsd*)
                MKAFS_OSTYPE=NBSD
                AC_MSG_RESULT(nbsd)
                ;;
-       *-openbsd*)
+       x86_64-*-openbsd*)
+               MKAFS_OSTYPE=OBSD
+               AC_MSG_RESULT(amd64_obsd)
+               ;;
+       i386-openbsd*)
                MKAFS_OSTYPE=OBSD
                AC_MSG_RESULT(i386_obsd)
                ;;
+       *-dragonfly*)
+               MKAFS_OSTYPE=DFBSD
+               AC_MSG_RESULT(i386_dfbsd)
+               ;;
         *)
                 AC_MSG_RESULT($system)
                 ;;
@@ -474,12 +502,30 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="sparc64_obsd${vM}${vm}"
                        ;;
+               x86_64-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="amd64_obsd${vM}${vm}"
+                       ;;
                i?86-*-freebsd?.*)
                        v=${host#*freebsd}
                        vM=${v%.*}
                        vm=${v#*.}
                        AFS_SYSNAME="i386_fbsd_${vM}${vm}"
                        ;;
+               x86_64-*-freebsd?.*)
+                       v=${host#*freebsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="amd64_fbsd_${vM}${vm}"
+                       ;;
+               i386-*-dragonfly2.2*)
+                       AFS_SYSNAME="i386_dfbsd_23"
+                       ;;
+               i386-*-dragonfly2.3*)
+                       AFS_SYSNAME="i386_dfbsd_23"
+                       ;;
                i?86-*-netbsd*1.5*)
                        AFS_SYSNAME="i386_nbsd15"
                        ;;
@@ -498,11 +544,13 @@ else
                amd64-*-netbsd*2.0*)
                        AFS_SYSNAME="amd64_nbsd20"
                        ;;
-               x86_64-*-netbsd*3.[0-8]*)
+               x86_64-*-netbsd*3.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="amd64_nbsd30"
                        ;;
-               x86_64-*-netbsd*4.[0-8]*)
+               x86_64-*-netbsd*4.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd40.h
                        AFS_SYSNAME="amd64_nbsd40"
                        ;;
@@ -629,6 +677,9 @@ else
                i386-apple-darwin9.*)
                        AFS_SYSNAME="x86_darwin_90"
                        ;;
+               i?86-apple-darwin10.*)
+                       AFS_SYSNAME="x86_darwin_100"
+                       ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
                        enable_login="yes"
@@ -709,6 +760,9 @@ else
                i?86-*-linux*)
                        AFS_SYSNAME="i386_linuxXX"
                        ;;
+               arm*-linux*)
+                       AFS_SYSNAME="arm_linuxXX"
+                       ;;
                parisc-*-linux-gnu|hppa-*-linux-gnu)
                        AFS_SYSNAME="parisc_linuxXX"
                        enable_pam="no"
@@ -739,7 +793,7 @@ else
                        ;;
                x86_64-*-linux-gnu)
                        AFS_SYSNAME="amd64_linuxXX"
-                       enable_pam="no"
+                       enable_pam="yes"
                        ;;
                *)
                        AC_MSG_ERROR(An AFS sysname is required)
@@ -780,6 +834,21 @@ case $AFS_SYSNAME in
     *_nbsd21)   AFS_PARAM_COMMON=param.nbsd21.h  ;;
     *_nbsd30)   AFS_PARAM_COMMON=param.nbsd30.h  ;;
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
+    *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
+    *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
+    *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
+    *_obsd34)   AFS_PARAM_COMMON=param.obsd34.h  ;;
+    *_obsd35)   AFS_PARAM_COMMON=param.obsd35.h  ;;
+    *_obsd36)   AFS_PARAM_COMMON=param.obsd36.h  ;;
+    *_obsd37)   AFS_PARAM_COMMON=param.obsd37.h  ;;
+    *_obsd38)   AFS_PARAM_COMMON=param.obsd38.h  ;;
+    *_obsd39)   AFS_PARAM_COMMON=param.obsd39.h  ;;
+    *_obsd40)   AFS_PARAM_COMMON=param.obsd40.h  ;;
+    *_obsd41)   AFS_PARAM_COMMON=param.obsd41.h  ;;
+    *_obsd42)   AFS_PARAM_COMMON=param.obsd42.h  ;;
+    *_obsd43)   AFS_PARAM_COMMON=param.obsd43.h  ;;
+    *_obsd44)   AFS_PARAM_COMMON=param.obsd44.h  ;;
+    *_obsd45)   AFS_PARAM_COMMON=param.obsd45.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -820,6 +889,10 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_HAVE_WRITE_BEGIN_AOP
                  LINUX_HAVE_BDI_INIT
                  LINUX_KMEM_CACHE_INIT
+                 LINUX_HAVE_GRAB_CACHE_PAGE_WRITE_BEGIN
+                LINUX_HAVE_PAGEVEC_LRU_ADD_FILE
+                 LINUX_STRUCT_TASK_HAS_CRED
+                LINUX_STRUCT_PROC_DIR_ENTRY_HAS_OWNER
                 LINUX_HAVE_KMEM_CACHE_T
                 LINUX_KMEM_CACHE_CREATE_TAKES_DTOR
                 LINUX_D_PATH_TAKES_STRUCT_PATH
@@ -831,6 +904,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_DEFINES_FOR_EACH_PROCESS
                 LINUX_DEFINES_PREV_TASK
                 LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE
+                LINUX_STRUCT_SUPER_BLOCK_HAS_S_BDI
                 LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
                 LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
                 LINUX_FS_STRUCT_INODE_HAS_I_ALLOC_SEM
@@ -860,11 +934,15 @@ 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
                 LINUX_KERNEL_HLIST_UNHASHED
                  LINUX_KEY_TYPE_H_EXISTS
+                LINUX_EXPORTS_KEY_TYPE_KEYRING
+                LINUX_KEYS_HAVE_SESSION_TO_PARENT
                 LINUX_NEED_RHCONFIG
                 LINUX_RECALC_SIGPENDING_ARG_TYPE
                 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT
@@ -889,12 +967,21 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_REFRIGERATOR
                 LINUX_LINUX_KEYRING_SUPPORT
                 LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
+                LINUX_KEY_ALLOC_NEEDS_CRED
                 LINUX_DO_SYNC_READ
                 LINUX_GENERIC_FILE_AIO_READ
                 LINUX_INIT_WORK_HAS_DATA
                 LINUX_REGISTER_SYSCTL_TABLE_NOFLAG
                 LINUX_SYSCTL_TABLE_CHECKING
                 LINUX_HAVE_IGET
+                if test "x$ac_cv_linux_have_iget" = "xno"; then
+                  AC_DEFINE([LINUX_USE_FH], 1, [define to use linux file handles for cache files])
+                fi
+                LINUX_HAVE_I_SIZE_READ
+                LINUX_HAVE_D_ALLOC_ANON
+                if test "x$ac_cv_linux_d_alloc_anon" = "xno"; then
+                  AC_DEFINE([AFS_NONFSTRANS], 1, [define to disable the nfs translator])
+                fi
                 LINUX_FS_STRUCT_NAMEIDATA_HAS_PATH
                 LINUX_EXPORTS_INIT_MM
                  LINUX_EXPORTS_SYS_CHDIR
@@ -1157,9 +1244,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then
                  AC_DEFINE(KMEM_CACHE_TAKES_DTOR, 1, [define if kmem_cache_create takes a destructor argument])
                 fi
-                if test "$enable_linux_fh" = "yes"; then
-                 AC_DEFINE(LINUX_USE_FH, 1, [define if you want to open cache files by file handle instead of inode numbers])
-                fi
                 if test "x$ac_cv_linux_kernel_page_follow_link" = "xyes" -o "x$ac_cv_linux_func_i_put_link_takes_cookie" = "xyes"; then
                  AC_DEFINE(USABLE_KERNEL_PAGE_SYMLINK_CACHE, 1, [define if your kernel has a usable symlink cache API])
                 else
@@ -1221,34 +1305,9 @@ fi
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
 else
-  AC_CHECK_FUNCS(socket)
-
-  if test "$ac_cv_func_socket" = no; then
-    for lib in socket inet; do
-        if test "$HAVE_SOCKET" != 1; then
-                AC_CHECK_LIB(${lib}, socket,LIBS="$LIBS -l$lib";HAVE_SOCKET=1;AC_DEFINE(HAVE_SOCKET, 1, [define if you have socket]))
-        fi
-    done
-  fi
-  
-  AC_CHECK_FUNCS(connect)       
-
-  if test "$ac_cv_func_connect" = no; then
-    for lib in nsl; do
-        if test "$HAVE_CONNECT" != 1; then
-                AC_CHECK_LIB(${lib}, connect,LIBS="$LIBS -l$lib";HAVE_CONNECT=1;AC_DEFINE(HAVE_CONNECT, 1, [define if you have connect]))
-        fi
-    done
-  fi
-
-  AC_CHECK_FUNCS(gethostbyname)
-  if test "$ac_cv_func_gethostbyname" = no; then
-        for lib in dns nsl resolv; do
-          if test "$HAVE_GETHOSTBYNAME" != 1; then
-            AC_CHECK_LIB(${lib}, gethostbyname, LIBS="$LIBS -l$lib";HAVE_GETHOSTBYNAME=1;AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [define if you have gethostbyname]))
-          fi
-        done    
-  fi    
+  AC_SEARCH_LIBS([socket], [socket inet])
+  AC_SEARCH_LIBS([connect], [nsl])
+  AC_SEARCH_LIBS([gethostbyname], [dns nsl resolv])
 
   dnl darwin wants it, aix hates it
   AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h)
@@ -1311,6 +1370,9 @@ PTHREAD_LIBS=error
 if test "x$MKAFS_OSTYPE" = OBSD; then
         PTHREAD_LIBS="-pthread"
 fi
+if test "x$MKAFS_OSTYPE" = xDFBSD; then
+        PTHREAD_LIBS="-pthread"
+fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_LIB(pthread, pthread_attr_init,
                 PTHREAD_LIBS="-lpthread")
@@ -1410,10 +1472,6 @@ if test "$enable_bos_restricted_mode" = "yes"; then
        AC_DEFINE(BOS_RESTRICTED_MODE, 1, [define if you want to want bos restricted mode])
 fi
 
-if test "$enable_bos_new_config" = "yes"; then
-       AC_DEFINE(BOS_NEW_CONFIG, 1, [define if you want to enable automatic renaming of BosConfig.new to BosConfig at startup])
-fi
-
 if test "$enable_largefile_fileserver" = "yes"; then
        AC_DEFINE(AFS_LARGEFILE_ENV, 1, [define if you want large file fileserver])
 fi
@@ -1424,20 +1482,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
 
@@ -1484,14 +1548,27 @@ dnl checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h poll.h fcntl.h sys/time.h sys/file.h)
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h poll.h fcntl.h sys/time.h sys/file.h grp.h)
 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)
-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(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 sys/ipc.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
@@ -1516,8 +1593,7 @@ AC_SUBST(BUILD_LOGIN)
 
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec flock)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
-AC_CHECK_FUNCS(setvbuf vsyslog)
-AC_FUNC_SETVBUF_REVERSED
+AC_CHECK_FUNCS(setvbuf vsyslog getcwd)
 AC_CHECK_FUNCS(regcomp regexec regerror)
 AC_MSG_CHECKING([for POSIX regex library])
 if test "$ac_cv_header_regex_h" = "yes" && \
@@ -1530,8 +1606,15 @@ else
     AC_MSG_RESULT(no)
 fi
 
+AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
+AC_CHECK_SIZEOF(void *)
+AC_TYPE_INTPTR_T
+AC_TYPE_UINTPTR_T
 AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPES(sig_t, , ,
+  [#include <sys/types.h>
+   #include <signal.h> ])
 AC_CHECK_TYPE([sig_atomic_t], ,
     [AC_DEFINE([sig_atomic_t], [int],
         [Define to int if <signal.h> does not define.])],
@@ -1555,6 +1638,7 @@ if test "x$enable_transarc_paths" = "xyes"  ; then
     afslocaldir=${afslocaldir=/usr/afs/local}
     afsbackupdir=${afsbackupdir=/usr/afs/backup}
     afsbosconfigdir=${afsbosconfigdir=/usr/afs/local}
+    afsdatadir=${afsdatadir=/usr/vice/etc}
 else 
     afsconfdir=${afsconfdir='${sysconfdir}/openafs/server'}
     viceetcdir=${viceetcdir='${sysconfdir}/openafs'}
@@ -1567,6 +1651,7 @@ else
     afslocaldir=${afslocaldir='${localstatedir}/openafs'}
     afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
     afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'}
+    afsdatadir=${afsdatadir='${datadir}/openafs'}
 fi
 AC_SUBST(afsconfdir)
 AC_SUBST(viceetcdir)
@@ -1579,6 +1664,7 @@ AC_SUBST(afslogsdir)
 AC_SUBST(afslocaldir)
 AC_SUBST(afsbackupdir)
 AC_SUBST(afsbosconfigdir)
+AC_SUBST(afsdatadir)
 
 if test "x$enable_kernel_module" = "xyes"; then
 ENABLE_KERNEL_MODULE=libafs
@@ -1588,6 +1674,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)
@@ -1607,6 +1694,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