user mode linux detection in configure

diff --git a/ChangeLog b/ChangeLog
index 2d8b9950c0f21dc67509d9052d115f64b104171f..6b3b3c069a2576fa0a9af3abc3d5d1625f05c2db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-02  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Add detection of user-mode-linux to configure
+
 2004-03-31  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * fixed zero size case for getxattr and listxattr

diff --git a/configure.in b/configure.in
index 8a29c0e3362e61421e13c081e85cd11abceff76f..bc272f12173948ec45669c4dac9fa482b2cbadce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -70,6 +70,15 @@ if test "$enable_kernel_module" != "no"; then
                        [#include <linux/fs.h>])
                CFLAGS="$old_cflags"
        fi
+       isuml=no
+       KERNELMAKE_PARAMS=
+       AC_MSG_CHECKING([if this is user mode linux])
+       if test -f $kernelsrc/include/linux/autoconf.h && grep -q "^#define CONFIG_USERMODE 1" $kernelsrc/include/linux/autoconf.h; then
+               isuml=yes
+               KERNELMAKE_PARAMS="ARCH=um"
+       fi
+       AC_MSG_RESULT([$isuml])
+       AC_SUBST(KERNELMAKE_PARAMS)
 fi
 
 if test "$enable_lib" != "no"; then

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 4015069e7488f80be49f3347013b3871ea8a7ce9..0421f54192b2f6f28050a8c740e74a7810af1b54 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -73,7 +73,7 @@ obj-m := fuse.o
 fuse-objs := dev.o dir.o file.o inode.o util.o
 
 all-spec:
-       $(MAKE) -C @kernelsrc@ SUBDIRS=$(PWD) modules
+       $(MAKE) -C @kernelsrc@ SUBDIRS=$(PWD) @KERNELMAKE_PARAMS@ modules
 endif