$LINUX_OBJ/include/linux/version.h
],[],
[AC_MSG_ERROR([Run make config in $LINUX.])])
-#
-LB_CHECK_FILE([$LINUX_OBJ/include/linux/config.h],
- [ AC_DEFINE(HAVE_KERNEL_CONFIG_H, 1,
- [kernel modules need to include config.h])
- ]
-)
# ------------ rhconfig.h includes runtime-generated bits --
# red hat kernel-source checks
AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
[m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
-AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
[$4],
[_AC_MSG_LOG_CONFTEST
m4_ifvaln([$5],[$5])dnl])dnl
])
#
+# LB_LINUX_ARCH
+#
+# Determine the kernel's idea of the current architecture
+#
+AC_DEFUN([LB_LINUX_ARCH],
+ [AC_MSG_CHECKING([Linux kernel architecture])
+ AS_IF([rm -f $PWD/build/arch
+ make -s --no-print-directory echoarch -f $PWD/build/Makefile \
+ LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX_OBJ $ARCH_UM \
+ ARCHFILE=$PWD/build/arch && LINUX_ARCH=`cat $PWD/build/arch`],
+ [AC_MSG_RESULT([$LINUX_ARCH])],
+ [AC_MSG_ERROR([Could not determine the kernel architecture.])])
+ rm -f build/arch])
+
+#
# LB_LINUX_TRY_COMPILE
#
# like AC_TRY_COMPILE
AC_DEFUN([LB_LINUX_CONFIG],
[AC_MSG_CHECKING([if Linux was built with CONFIG_$1])
LB_LINUX_TRY_COMPILE([
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
],[