fix fuseblk compilation

diff --git a/ChangeLog b/ChangeLog
index aceef05a04b8b7a701bee1137025e99c194549e7..84328a9fca483b734fff9274f49f066c488d1ad6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-04  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Released 2.6.3
+
+2007-02-04  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Compile fuseblk for kernels which don't have an option to turn
+       off the block layer (CONFIG_BLOCK).  Reported by Szakacsits
+       Szabolcs
+
 2007-02-02  Miklos Szeredi <miklos@szeredi.hu>
 
        * Fix regression caused by "Fix possible double lock in certain

diff --git a/configure.in b/configure.in
index 7ee494bbf61571f5837b8089ebc994bab2d09ff3..24ce3a219f44c04399b5df4cc56be439ee78d89a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.6.2)
+AC_INIT(fuse, 2.6.3)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)

diff --git a/kernel/configure.ac b/kernel/configure.ac
index 08b6f3c9787a14cabc4e117c410bee9555e9fe2f..62898d0b78e0187742d7ee561ce8494ae30e1902 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.6.2)
+AC_INIT(fuse-kernel, 2.6.3)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL
@@ -193,6 +193,13 @@ if test "$ENABLE_FUSE_MODULE" = y; then
        else
                AC_MSG_RESULT([no])
        fi
+       AC_MSG_CHECKING([if kernel has BLOCK option ])
+       if test -f $kernelsrc/block/Kconfig && egrep -wq "config *BLOCK" $kernelsrc/block/Kconfig; then
+               AC_DEFINE(HAVE_CONFIG_BLOCK, 1, [kernel has BLOCK option])
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+       fi
 
        isuml=no
        KERNELMAKE_PARAMS=

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index f4e2ece01bd1e9b993b383891f492e637b38f658..7fd70a4fcf0760e5ca57affe970d6d6b65cf8571 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -73,6 +73,9 @@
 #define clear_nlink(inode) (inode)->i_nlink = 0
 #define inc_nlink(inode) (inode)->i_nlink++
 #endif
+#ifndef HAVE_CONFIG_BLOCK
+#define CONFIG_BLOCK
+#endif
 
 /** Max number of pages that can be used in a single read request */
 #define FUSE_MAX_PAGES_PER_REQ 32

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 57775ff52d97c18d8f14f12260d3fd9e22788ce3..fc06b1278f811ebe3ed4ab2ba452c2f225c6d7ad 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -26,7 +26,7 @@ libfuse_la_SOURCES =          \
        helper.c                \
        $(mount_source)
 
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:2 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:3 \
        -Wl,--version-script,$(srcdir)/fuse_versionscript
 
 libulockmgr_la_SOURCES = ulockmgr.c