Linux: Use kbuild to check for UML
authorAnders Kaseorg <andersk@mit.edu>
Sat, 20 Feb 2010 18:28:59 +0000 (13:28 -0500)
committerDerrick Brashear <shadow@dementia.org>
Tue, 23 Feb 2010 19:54:07 +0000 (11:54 -0800)
<linux/autoconf.h> is automatically included by kbuild; you aren’t
supposed to include it directly.  That breaks in 2.6.33 because
<linux/autoconf.h> is moving to <generated/autoconf.h>.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Change-Id: I56c90dfe90ef72408620793fcd4e927ea3d8f468
Reviewed-on: http://gerrit.openafs.org/1350
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

acinclude.m4

index a88e464..ab229e1 100644 (file)
@@ -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 <linux/autoconf.h>],
+                       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