git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Linux 3.6: create inode operation API change
[openafs.git] / acinclude.m4
diff --git a/acinclude.m4 b/acinclude.m4
index d2ce60f..f83569d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,10 @@ 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([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
@@ -374,7 +378,7 @@ case $system in
                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
@@ -577,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"
                        ;;
@@ -793,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])
@@ -840,6 +853,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;
@@ -905,6 +921,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
@@ -954,6 +974,11 @@ 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_IOP_I_CREATE_TAKES_BOOL
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1124,8 +1149,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
@@ -1196,10 +1221,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=""
@@ -1367,16 +1388,16 @@ 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.
@@ -1401,6 +1422,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 \
@@ -1411,7 +1439,6 @@ AC_CHECK_FUNCS([ \
        geteuid \
        getgid \
        getuid \
-       getprogname \
        getrlimit \
        issetugid \
        mkstemp \
@@ -1425,13 +1452,13 @@ AC_CHECK_FUNCS([ \
        regerror \
        regexec \
        setitimer \
-       setprogname \
        setvbuf \
        sigaction \
        strcasestr \
        strerror \
        sysconf \
        sysctl \
+       tdestroy \
        timegm \
 ])
 
@@ -1484,6 +1511,7 @@ AC_REPLACE_FUNCS([ \
        localtime_r \
        mkstemp \
        setenv \
+       setprogname \
        strcasecmp \
        strlcat \
        strnlen \
@@ -1834,8 +1862,14 @@ LIB_hcrypto="-lafshcrypto"
 LDFLAGS_hcrypto="-L\$(TOP_LIBDIR)"
 AC_SUBST(LIB_hcrypto)
 AC_SUBST(LDFLAGS_hcrypto)
+
+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])
 ])
 
+
 AC_DEFUN([SUMMARY], [
     # Print a configuration summary
 echo 
OpenAFS Master Repository