cmd tests: Initialise string retval

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index eb158ed..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  ;;
@@ -1228,7 +1249,6 @@ AC_CHECK_HEADERS([ \
                   math.h \
                   mntent.h \
                   ncurses.h \
-                  net/if.h \
                   netdb.h \
                   netinet/in.h \
                   pwd.h \
@@ -1275,10 +1295,16 @@ 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>
@@ -1568,7 +1594,7 @@ AC_CHECK_TYPES([long long], [], [], [])
 
 AC_SIZEOF_TYPE(long)
 
-AC_HEADER_PAM_CONST
+RRA_HEADER_PAM_CONST
 
 
 dnl Directory PATH handling