From 45c701911e15c828ee1a376398a5179e42ccca97 Mon Sep 17 00:00:00 2001 From: Roland Bauerschmidt Date: Mon, 8 Apr 2002 09:16:25 +0000 Subject: [PATCH] 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. --- Makefile.am | 2 +- configure.in | 87 +++++++++++++++++++++++++++++++------------------- debian/control | 41 ------------------------ 3 files changed, 56 insertions(+), 74 deletions(-) delete mode 100644 debian/control diff --git a/Makefile.am b/Makefile.am index cdef4b8..c8d2345 100644 --- 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 98c88d2..05cbcf8 100644 --- 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 - -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 index 2185e3f..0000000 --- a/debian/control +++ /dev/null @@ -1,41 +0,0 @@ -Source: fuse -Priority: optional -Maintainer: Roland Bauerschmidt -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. -- 2.30.2