configure: make use of native build assist tools possible

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index e67d220..28d60f9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -233,6 +233,8 @@ AC_ARG_ENABLE([linux-syscall-probing],
        [enable Linux syscall probing (defaults to autodetect)])],
     ,
     [enable_linux_syscall_probing="maybe"])
+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],
@@ -477,13 +479,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#*.}
@@ -799,6 +801,9 @@ 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])
+
                 dnl Check for structure elements
                 AC_CHECK_LINUX_STRUCT([address_space_operations],
                                       [write_begin], [fs.h])
@@ -921,6 +926,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
@@ -929,6 +938,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
@@ -971,6 +981,12 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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
+                LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
+                LINUX_IOP_LOOKUP_TAKES_UNSIGNED
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1141,8 +1157,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
@@ -1213,10 +1229,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=""
@@ -1807,6 +1819,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)
@@ -1858,8 +1888,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