Removed debian/control from CVS as it is auto-generated to be able to

build both the utility packages and the kernel module packages. Modified
Makefile.am and configure.in to add --enable-{lib,kernel-module,util,
example} options.

diff --git a/Makefile.am b/Makefile.am
index cdef4b85d4038acf4536f685d9c6d5322372369b..c8d2345e2e4edc0416f991c49dfc93c55903286e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = kernel lib util example include patch
+SUBDIRS = @subdirs@
 
 EXTRA_DIST =                   \
        fuse.spec               \

diff --git a/configure.in b/configure.in
index 98c88d238bbac7317ce2c4552ee983785995f66a..05cbcf8e1047eaf0ef554e8079975e0b8fe119e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,24 +12,35 @@ AC_SUBST(LD)
 
 CFLAGS="-Wall -W -g -O2"
 
-AC_MSG_CHECKING([kernel source directory])
-kernelsrc=
-AC_ARG_WITH(kernel,
-       [  --with-kernel          Specify location of kernel source ],
-       [kernelsrc="$withval"])
+AC_ARG_ENABLE(kernel-module,
+       [  --enable-kernel-module  Compile kernel module, requires --with-kernel option ])
+AC_ARG_ENABLE(lib,
+       [  --enable-lib            Compile with library ])
+AC_ARG_ENABLE(util,
+       [  --enable-util           Compile with util ])
+AC_ARG_ENABLE(example,
+       [  --enable-example        Compile with examples ])
 
-if test -z "$kernelsrc"; then
-       buildlink=/lib/modules/`uname -r`/build
-       if test -e $buildlink; then
-               kernelsrc=`(cd $buildlink; /bin/pwd)`
-       else
-               AC_MSG_RESULT([Not found])
-               AC_MSG_ERROR([
+if test "$enable_kernel_module" != "no"; then
+       AC_MSG_CHECKING([kernel source directory])
+       kernelsrc=
+       AC_ARG_WITH(kernel,
+               [  --with-kernel           Specify location of kernel source ],
+               [kernelsrc="$withval"])
+
+       if test -z "$kernelsrc"; then
+               buildlink=/lib/modules/`uname -r`/build
+               if test -e $buildlink; then
+                       kernelsrc=`(cd $buildlink; /bin/pwd)`
+               else
+                       AC_MSG_RESULT([Not found])
+                       AC_MSG_ERROR([
 *** Please specify the location of the kernel source with
 *** the '--with-kernel=SRCDIR' option])
+               fi
        fi
+       AC_MSG_RESULT([$kernelsrc])
 fi
-AC_MSG_RESULT([$kernelsrc])
 
 oldcc=$CC
 oldcross_compiling=$cross_compiling
@@ -38,33 +49,45 @@ if test "$cross_compiling" = yes; then
        cross_compiling=no
 fi
 
-AC_MSG_CHECKING([kernel source version])
-kernsrcver=`AC_TRY_RUN([
-#include "$kernelsrc/include/linux/version.h"
-#include <stdio.h>
-
-int main() {
-printf("%s\n", UTS_RELEASE);
-       return 0;
-}
-], , , true)`
+if test "$enable_kernel_module" != "no"; then
+       AC_MSG_CHECKING([kernel source version])
+       kernsrcver=`sed -ne '/^VERSION = \(.*\)/{s//\1/;p;q;}' $kernelsrc/Makefile`
+       kernsrcver="$kernsrcver.`sed -ne '/^PATCHLEVEL = \(.*\)/{s//\1/;p;q;}' $kernelsrc/Makefile`"
+       kernsrcver="$kernsrcver.`sed -ne '/^SUBLEVEL = \(.*\)/{s//\1/;p;q;}' $kernelsrc/Makefile`"
+       kernsrcver="$kernsrcver`sed -ne '/^EXTRAVERSION = \(.*\)/{s//\1/;p;q;}' $kernelsrc/Makefile`"
 
-if test -z "$kernsrcver"; then
-       AC_MSG_RESULT([Not found])
-       AC_MSG_ERROR([
+       if test -z "$kernsrcver"; then
+               AC_MSG_RESULT([Not found])
+               AC_MSG_ERROR([
 *** Cannot determine the version of the linux kernel source. Please 
 *** configure the kernel before running this script])
+       fi
+       AC_MSG_RESULT([$kernsrcver])
 fi
-AC_MSG_RESULT([$kernsrcver])
 
 CC=$oldcc
 cross_compiling=$oldcross_compiling
+subdirs="include patch"
 
-KERNINCLUDE=$kernelsrc/include
-AC_SUBST(KERNINCLUDE)
-kmoduledir=/lib/modules/$kernsrcver
-AC_SUBST(kmoduledir)
+if test "$enable_kernel_module" != "no"; then
+       KERNINCLUDE=$kernelsrc/include
+       AC_SUBST(KERNINCLUDE)
+       kmoduledir=/lib/modules/$kernsrcver
+       AC_SUBST(kmoduledir)
+       subdirs="$subdirs kernel"
+fi
 
-AC_OUTPUT([Makefile kernel/Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile patch/Makefile])
+if test "$enable_lib" != "no"; then
+       subdirs="$subdirs lib";
+fi
+if test "$enable_util" != "no"; then
+       subdirs="$subdirs util";
+fi
+if test "$enable_example" != "no"; then
+       subdirs="$subdirs example";
+fi
+
+AC_SUBST(subdirs)
 
+AC_OUTPUT([Makefile kernel/Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile patch/Makefile])
 

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 2185e3f..0000000
--- a/debian/control
+++ /dev/null
@@ -1,41 +0,0 @@
-Source: fuse
-Priority: optional
-Maintainer: Roland Bauerschmidt <rb@debian.org>
-Build-Depends: debhelper (>> 3.0.0), automake, autoconf
-Standards-Version: 3.5.6.1
-
-Package: libfuse-dev
-Section: devel
-Architecture: any
-Suggests: fuse-utils (= ${Source-Version}), fuse-module
-Description: Filesystem in USErspace (development files)
- Simple interface for userspace programs to export a virtual
- filesystem to the linux kernel.
- .
- This package contains the files necessary to write applications in C
- or C++ using fuse.
-
-Package: fuse-utils
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: fuse-module
-Description: Filesystem in USErspace (utilities)
- Simple interface for userspace programs to export a virtual
- filesystem to the linux kernel.
- .
- This package contains the fusermount utility which is necessary to
- mount fuse filesystems.
-
-Package: fuse-source
-Section: utils
-Architecture: all
-Depends: make, gcc | c-compiler
-Recommends: dpkg-dev, kernel-package
-Suggests: devscripts
-Description: Filesystem in USErspace (source for kernel module)
- Simple interface for userspace programs to export a virtual
- filesystem to the linux kernel. 
- .
- This package contains the source code for the fuse module. It is
- required to use fuse with a self-compiled kernel.