mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-11-26 21:54:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

release 2.2-pre1

Browse Source
This commit is contained in:
Miklos Szeredi 2005-01-09 12:27:41 +00:00
parent 9080c79e94
commit 8c7da23a87
4 changed files with 66 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-01-09 Miklos Szeredi <miklos@szeredi.hu>
* Released 2.2-pre1
2005-01-09 Miklos Szeredi <miklos@szeredi.hu>
* If FUSE is configured in the kernel, don't build it by default
2005-01-07 Miklos Szeredi <miklos@szeredi.hu>
* Compile fix by Christian Magnusson

2
configure.in
View File

@ -1,4 +1,4 @@
AC_INIT(fuse, 2.2-pre0)
AC_INIT(fuse, 2.2-pre1)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(include/config.h)

14
kernel/Makefile.in
View File

@ -18,14 +18,22 @@ else
fusemodule := fuse.ko
endif
all: all-spec
all: all-@ENABLE_FUSE_MODULE@
install: install-@ENABLE_FUSE_MODULE@
uninstall: uninstall-@ENABLE_FUSE_MODULE@
install: all
all-n:
install-n:
uninstall-n:
all-y: all-spec
install-y: all
$(mkdir_p) $(DESTDIR)$(fusemoduledir)
$(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)
-/sbin/depmod -a
uninstall:
uninstall-y:
rm -f $(DESTDIR)$(fusemoduledir)/$(fusemodule)
-/sbin/depmod -a

65
kernel/configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT(fuse-kernel, 2.2-pre0)
AC_INIT(fuse-kernel, 2.2-pre1)
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL
@ -22,6 +22,9 @@ if test -z "$kernelsrc"; then
fi
AC_MSG_RESULT([$kernelsrc])
AC_ARG_ENABLE(kernel-module,
[ --enable-kernel-module Compile kernel module ])
AC_MSG_CHECKING([kernel source version])
if test -r $kernelsrc/include/linux/version.h; then
kernsrcver=`(echo "#include <linux/version.h>"; echo "kernsrcver=UTS_RELEASE") | cpp -I $kernelsrc/include | grep "^kernsrcver=" | cut -d \" -f 2`
@ -39,6 +42,7 @@ AC_SUBST(kernelsrc)
AC_SUBST(majver)
AC_SUBST(kmoduledir)
ENABLE_FUSE_MODULE=y
if echo "$kernsrcver" | grep -q "^2.4"; then
old_cflags="$CFLAGS"
CFLAGS="-I${kernelsrc}/include -Wall -O2 -fno-strict-aliasing -D__KERNEL__"
@ -47,28 +51,51 @@ if echo "$kernsrcver" | grep -q "^2.4"; then
[Kernel has i_size_read() and i_size_write() functions]),,
[#include <linux/fs.h>])
CFLAGS="$old_cflags"
fi
AC_MSG_CHECKING([if kernel has extended attribute support])
if test -f $kernelsrc/include/linux/xattr.h; then
AC_DEFINE(HAVE_KERNEL_XATTR, 1, [Kernel has xattr support])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fuse_configured=no
kernel_autoconf=$kernelsrc/include/linux/autoconf.h
AC_MSG_CHECKING([if FUSE is configured in the kernel])
if test -f $kernel_autoconf; then
if grep -q "^#define CONFIG_FUSE 1" $kernel_autoconf || grep -q "^#define CONFIG_FUSE_MODULE 1" $kernel_autoconf; then
fuse_configured=yes
fi
fi
AC_MSG_RESULT([$fuse_configured])
if test -z "$enable_kernel_module" -a "$fuse_configured" = yes; then
ENABLE_FUSE_MODULE=n
AC_MSG_WARN([FUSE is configured in the kernel, not building kernel])
AC_MSG_WARN([module. To force building of kernel module use the])
AC_MSG_WARN(['--enable-kernel-module' option.])
fi
fi
if test "$enable_kernel_module" = no; then
ENABLE_FUSE_MODULE=n
fi
isuml=no
KERNELMAKE_PARAMS=
KERNELCPPFLAGS=
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"
KERNELCPPFLAGS="-D__arch_um__ -DSUBARCH=\\\"i386\\\" -D_LARGEFILE64_SOURCE -I${kernelsrc}/arch/um/include -Derrno=kernel_errno -I${kernelsrc}/arch/um/kernel/tt/include -I${kernelsrc}/arch/um/kernel/skas/include"
AC_SUBST(ENABLE_FUSE_MODULE)
if test "$ENABLE_FUSE_MODULE" = y; then
AC_MSG_CHECKING([if kernel has extended attribute support])
if test -f $kernelsrc/include/linux/xattr.h; then
AC_DEFINE(HAVE_KERNEL_XATTR, 1, [Kernel has xattr support])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
isuml=no
KERNELMAKE_PARAMS=
KERNELCPPFLAGS=
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"
KERNELCPPFLAGS="-D__arch_um__ -DSUBARCH=\\\"i386\\\" -D_LARGEFILE64_SOURCE -I${kernelsrc}/arch/um/include -Derrno=kernel_errno -I${kernelsrc}/arch/um/kernel/tt/include -I${kernelsrc}/arch/um/kernel/skas/include"
fi
AC_MSG_RESULT([$isuml])
AC_SUBST(KERNELMAKE_PARAMS)
AC_SUBST(KERNELCPPFLAGS)
fi
AC_MSG_RESULT([$isuml])
AC_SUBST(KERNELMAKE_PARAMS)
AC_SUBST(KERNELCPPFLAGS)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT