From: Anders Kaseorg Date: Sat, 20 Feb 2010 18:28:59 +0000 (-0500) Subject: Linux: Use kbuild to check for UML X-Git-Tag: openafs-devel-1_5_73~142 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=660c7a3952f36fc892e12aa6b11eda3295b1416d Linux: Use kbuild to check for UML is automatically included by kbuild; you aren’t supposed to include it directly. That breaks in 2.6.33 because is moving to . Signed-off-by: Anders Kaseorg Change-Id: I56c90dfe90ef72408620793fcd4e927ea3d8f468 Reviewed-on: http://gerrit.openafs.org/1350 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/acinclude.m4 b/acinclude.m4 index a88e464..ab229e1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -721,10 +721,8 @@ else fi _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/` AFS_SYSNAME="$_AFS_SYSNAME" - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-I${LINUX_KERNEL_PATH}/include $CPPFLAGS" - AC_TRY_COMPILE( - [#include ], + AC_TRY_KBUILD( + [], [#ifndef CONFIG_USERMODE #error not UML #endif], @@ -732,7 +730,6 @@ else if test "${ac_cv_linux_is_uml}" = yes; then _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/linux/umlinux/` fi - CPPFLAGS="$save_CPPFLAGS" AFS_SYSNAME="$_AFS_SYSNAME" ;; esac