STABLE14-linux-kernel-header-tests-20040818

check for existance of some headers (in_systm.h, mm_inline.h) to decide on inclusion

(cherry picked from commit fc441042fcfe619cc8fac528886782caed12ab48)

diff --git a/acinclude.m4 b/acinclude.m4
index 0aa601a1bdf587688589b24ed8cde05d19310679..14f70611aa803a582424e937d5a20d21a23468a4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -224,6 +224,15 @@ case $system in
                          fi
                    fi
                  fi
+                if test -f "$LINUX_KERNEL_PATH/include/linux/in_systm.h"; then
+                 AC_DEFINE(HAVE_IN_SYSTM_H, 1, [define if you have in_systm.h header file])
+                fi
+                if test -f "$LINUX_KERNEL_PATH/include/linux/mm_inline.h"; then
+                 AC_DEFINE(HAVE_MM_INLINE_H, 1, [define if you have mm_inline.h header file])
+                fi
+                if test -f "$LINUX_KERNEL_PATH/include/linux/in_systm.h"; then
+                 AC_DEFINE(HAVE_IN_SYSTM_H, 1, [define if you have in_systm.h header file])
+                fi
                 if test "x$ac_cv_linux_exports_sys_chdir" = "xyes" ; then
                  AC_DEFINE(EXPORTED_SYS_CHDIR, 1, [define if your linux kernel exports sys_chdir])
                 fi

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 8c69a2af11581196fed0f248a8a2551618df2d6e..4025b5a75b6c4154d8aa16f4b6dd0b363b00eb7e 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -29,6 +29,9 @@ RCSID
 #include "afs/afs_stats.h"
 #include "afs/afs_osidnlc.h"
 #include "h/mm.h"
+#ifdef HAVE_MM_INLINE_H
+#include "h/mm_inline.h"
+#endif
 #include "h/pagemap.h"
 #if defined(AFS_LINUX24_ENV)
 #include "h/smp_lock.h"

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 3a910def2015757612fbe41401b6798655551503..2545055dca1bb0c401e5258d6c3449b0cd2d5401 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -88,7 +88,9 @@ typedef unsigned short etap_event_t;
 #else
 #include "net/route.h"
 #endif
+#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX22_ENV)
 #include "netinet/in_systm.h"
+#endif
 #include "netinet/ip.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
 #include "netinet/in_pcb.h"