vlserver: fix vldb header initialization

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 085cfba..7f69dad 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -81,6 +81,8 @@ AC_ARG_ENABLE([pam],
     [enable_pam="yes"])
 AC_ARG_ENABLE([gtx],
     AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools]))
+AC_ARG_ENABLE([uss],
+    AS_HELP_STRING([--disable-uss], [disable uss bulk creation tool]))
 AC_ARG_ENABLE([namei-fileserver],
     [AS_HELP_STRING([--enable-namei-fileserver],
         [force compilation of namei fileserver in preference to inode
@@ -579,6 +581,14 @@ 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"
+                       ;;
                sparc-sun-solaris2.8)
                        AFS_SYSNAME="sun4x_58"
                        ;;
@@ -795,6 +805,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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([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])
@@ -1130,8 +1141,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
@@ -1202,10 +1213,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=""
@@ -1407,6 +1414,13 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
+if test "$enable_uss" = yes; then
+       BUILD_USS="yes"
+else
+       BUILD_USS="no"
+fi
+AC_SUBST(BUILD_USS)
+
 AC_CHECK_FUNCS([ \
        arc4random \
        fcntl \