aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in9
-rw-r--r--kernel/Makefile.in2
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d8b995..6b3b3c0 100644
--- 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 8a29c0e..bc272f1 100644
--- 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 4015069..0421f54 100644
--- 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