FBSD: VIMAGE support

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 457c55f..a8b3634 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -516,24 +516,43 @@ else
                        ;;
                powerpc-apple-darwin7*)
                        AFS_SYSNAME="ppc_darwin_70"
+                       OSXSDK="macosx10.3"
                        ;;
                powerpc-apple-darwin8.*)
                        AFS_SYSNAME="ppc_darwin_80"
+                       OSXSDK="macosx10.4"
                        ;;
                i386-apple-darwin8.*)
                        AFS_SYSNAME="x86_darwin_80"
+                       OSXSDK="macosx10.4"
                        ;;
                powerpc-apple-darwin9.*)
                        AFS_SYSNAME="ppc_darwin_90"
+                       OSXSDK="macosx10.5"
                        ;;
                i386-apple-darwin9.*)
                        AFS_SYSNAME="x86_darwin_90"
+                       OSXSDK="macosx10.5"
                        ;;
                i?86-apple-darwin10.*)
                        AFS_SYSNAME="x86_darwin_100"
+                       OSXSDK="macosx10.6"
                        ;;
                x86_64-apple-darwin10.*)
                        AFS_SYSNAME="x86_darwin_100"
+                       OSXSDK="macosx10.6"
+                       ;;
+               arm-apple-darwin10.*)
+                       AFS_SYSNAME="arm_darwin_100"
+                       OSXSDK="iphoneos4.0"
+                       ;;
+               x86_64-apple-darwin11.*)
+                       AFS_SYSNAME="x86_darwin_110"
+                       OSXSDK="macosx10.7"
+                       ;;
+               i?86-apple-darwin11.*)
+                       AFS_SYSNAME="x86_darwin_110"
+                       OSXSDK="macosx10.7"
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
@@ -682,6 +701,7 @@ case $AFS_SYSNAME in
                AC_CHECK_HEADERS(crt_externs.h)
                DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
                DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
+               AC_SUBST(OSXSDK)
                ;;
 esac
 
@@ -695,6 +715,7 @@ case $AFS_SYSNAME in
     *_nbsd30)   AFS_PARAM_COMMON=param.nbsd30.h  ;;
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
     *_nbsd50)   AFS_PARAM_COMMON=param.nbsd50.h  ;;
+    *_nbsd60)   AFS_PARAM_COMMON=param.nbsd60.h  ;;
     *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
     *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
     *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
@@ -848,7 +869,8 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                     [#include <linux/pagevec.h>],
                                     [__pagevec_lru_add_file(NULL);])
                 AC_CHECK_LINUX_FUNC([path_lookup],
-                                    [#include <linux/namei.h>],
+                                    [#include <linux/fs.h>
+                                     #include <linux/namei.h>],
                                     [path_lookup(NULL, 0, NULL);])
                 AC_CHECK_LINUX_FUNC([rcu_read_lock],
                                     [#include <linux/rcupdate.h>],
@@ -1224,6 +1246,7 @@ AC_CHECK_HEADERS([ \
                   errno.h \
                   fcntl.h \
                   grp.h \
+                  math.h \
                   mntent.h \
                   ncurses.h \
                   netdb.h \
@@ -1231,7 +1254,7 @@ AC_CHECK_HEADERS([ \
                   pwd.h \
                   regex.h \
                   resolv.h \
-                  security/pam_modules.h \
+                  security/pam_appl.h \
                   signal.h \
                   stdint.h \
                   stdio_ext.h \
@@ -1240,18 +1263,22 @@ AC_CHECK_HEADERS([ \
                   strings.h \
                   sys/bitypes.h \
                   sys/bswap.h \
+                  sys/dk.h \
                   sys/fcntl.h \
                   sys/file.h \
                   sys/fs_types.h \
                   sys/fstyp.h \
                   sys/ioctl.h \
                   sys/ipc.h \
+                  sys/lockf.h \
+                  sys/map.h \
                   sys/mount.h \
                   sys/mntent.h \
                   sys/mnttab.h \
                   sys/pag.h \
                   sys/param.h \
                   sys/resource.h \
+                  sys/select.h \
                   sys/statfs.h \
                   sys/statvfs.h \
                   sys/socket.h \
@@ -1268,6 +1295,20 @@ AC_CHECK_HEADERS([ \
                   unistd.h \
                   windows.h \
                ])
+AC_CHECK_HEADERS([net/if.h],[],[],[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif])
+
+AC_CHECK_HEADERS([netinet/if_ether.h],[],[],[AC_INCLUDES_DEFAULT
+#ifdef HAVE_NET_IF_H
+# include <net/if.h>
+#endif])
+
+AC_CHECK_HEADERS([security/pam_modules.h],[],[],[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SECURITY_PAM_APPL_H
+# include <security/pam_appl.h>
+#endif])
 
 AC_CHECK_HEADERS(linux/errqueue.h,,,[#include <linux/types.h>])
 
@@ -1362,17 +1403,18 @@ AC_CHECK_FUNCS([ \
        chown \
        fchown \
        gethostname \
-       gettimeofday \
-       localtime_r \
        lstat \
        inet_aton \
        inet_ntop \
        inet_pton \
+       putenv \
        readv \
+       setenv \
        strdup \
        strftime \
        strndup \
        strsep \
+       unsetenv \
 ])
 
 dnl Functions that are in objects that we always build from libroken
@@ -1397,12 +1439,18 @@ AC_REPLACE_FUNCS([ \
        getdtablesize \
        getopt \
        getprogname \
+       gettimeofday \
+       localtime_r \
        mkstemp \
        strcasecmp \
        strlcat \
        strnlen \
        strlcpy \
        strsep \
+       tdelete \
+       tfind \
+       tsearch \
+       twalk \
        verr \
        verrx \
        vsyslog \
@@ -1415,6 +1463,7 @@ AC_REPLACE_FUNCS([ \
 dnl Headers that we're going to try and get from libroken
 AC_CHECK_HEADERS([ \
        err.h \
+       search.h \
 ])
 
 AC_CHECK_DECLS([h_errno], [], [], [
@@ -1545,7 +1594,7 @@ AC_CHECK_TYPES([long long], [], [], [])
 
 AC_SIZEOF_TYPE(long)
 
-AC_HEADER_PAM_CONST
+RRA_HEADER_PAM_CONST
 
 
 dnl Directory PATH handling