Release: captive7

[lufs.git] / configure.in

diff --git a/configure.in b/configure.in
index 103f7bf..42a7443 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,11 @@ AC_PREREQ(2.50)
 AC_INIT(AUTHORS)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(lufs,0.9.6)
+VERSION_BASE=0.9.7
+VERSION_EXT=captive7
+AC_SUBST(VERSION_BASE)
+AC_SUBST(VERSION_EXT)
+AM_INIT_AUTOMAKE(lufs,$VERSION_BASE$VERSION_EXT)
 AM_MAINTAINER_MODE
 dnl Some Makefiles use additional tests etc.
 AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
@@ -31,87 +35,17 @@ AC_ARG_WITH(cxx,
        CXX=false
     ])
 
-AC_ARG_ENABLE(kernel-support,
-    [  --enable-kernel-support enable building of the kernel module (default=yes)],
-    [  KERNEL_SUPPORT=$enableval ],)
-
-if test "$KERNEL_SUPPORT" != "no"
+dnl Checking os
+AC_MSG_CHECKING(OS)
+OS_DIR=`uname -s`
+if test ! -d kernel/$OS_DIR
 then
-
-    dnl Checking os
-    AC_MSG_CHECKING(OS)
-    OS_DIR=`uname -s`
-    if test ! -d kernel/$OS_DIR
-    then
-       AC_MSG_ERROR($OS_DIR - not supported!)
-    else
-       AC_MSG_RESULT($OS_DIR)
-    fi
-
-    dnl LINUX kernel configuration
-    if test "$OS_DIR"="Linux"
-    then
-
-       dnl Checking kernel & headers
-        AC_MSG_CHECKING(kernel)
-       AC_ARG_WITH(kernel, 
-           [  --with-kernel=VERSION   specify a kernel version to compile for], 
-           [KERNEL_VERSION=$withval],
-           [KERNEL_VERSION=`uname -r`])    
-        MODULES_DIR=/lib/modules/$KERNEL_VERSION
-       AC_MSG_RESULT($KERNEL_VERSION)
-
-        AC_MSG_CHECKING(kernel support)
-       KERNEL_DIR=`echo $KERNEL_VERSION | cut -d'.' -f1,2`
-        if test ! -d kernel/$OS_DIR/$KERNEL_DIR
-       then
-           AC_MSG_ERROR([$KERNEL_DIR not supported!])
-        else
-           AC_MSG_RESULT([supported in kernel/$OS_DIR/$KERNEL_DIR])
-       fi
-
-        AC_MSG_CHECKING(kernel headers)
-       AC_ARG_WITH(kheaders,
-           [  --with-kheaders=DIR     specify the location of the kernel headers],
-           [KERNEL_HDR=$withval],
-           [KERNEL_HDR=$MODULES_DIR/build/include])
-        if test ! -f $KERNEL_HDR/linux/fs.h
-       then 
-           AC_MSG_ERROR([not found in $KERNEL_HDR. please install them!])
-        else
-           AC_MSG_RESULT([found in $KERNEL_HDR])
-       fi
-
-        AC_MSG_CHECKING(kernel configuration)
-       if test -f $MODULES_DIR/build/.config
-        then
-           tmp=`cat $MODULES_DIR/build/.config | grep CONFIG_MODVERSIONS=y`
-           if test "$tmp"
-           then
-               AC_MSG_RESULT([found, using modversions])
-               MODV_FLAGS="-DMODVERSIONS -include $KERNEL_HDR/linux/modversions.h"
-           else
-               AC_MSG_RESULT([found, not using modversions])
-           fi
-       else
-           AC_MSG_RESULT([not found at $MODULES_DIR/build/.config, assuming modversions support])
-           MODV_FLAGS="-DMODVERSIONS -include $KERNEL_HDR/linux/modversions.h"        
-       fi
-
-       AC_ARG_ENABLE(modversions, 
-           [  --enable-modversions    enable modeversions support (default=auto-detect)],
-           [ if test $enableval = "yes"; then MODV_FLAGS="-DMODVERSIONS -include $KERNEL_HDR/linux/modversions.h"; else MODV_FLAGS=""; fi ],)
-    
-       AC_SUBST(MODV_FLAGS)
-       AC_SUBST(KERNEL_DIR)
-        AC_SUBST(MODULES_DIR)
-       AC_SUBST(KERNEL_HDR)
-
-    fi
+    AC_MSG_ERROR($OS_DIR - not supported!)
+else
+    AC_MSG_RESULT($OS_DIR)
 fi
 AC_SUBST(OS_DIR)
 
-
 dnl options
 AC_ARG_ENABLE(debug,
     [  --enable-debug          enable debug messages to stdout (default=no)],
@@ -130,7 +64,7 @@ AC_ARG_ENABLE(autofs-install,
 AC_SUBST(AUTOFS_INSTALL)    
 
 AC_ARG_ENABLE(suid,
-    [  --enable-suid           make lufsmnt and lufsumount suid root (default=yes)],
+    [  --enable-suid           make lufsmnt suid root (default=yes)],
     [ if test $enableval = "no"; then LUFS_SUID=""; else LUFS_SUID="true"; fi ] , LUFS_SUID="true" )
 AC_SUBST(LUFS_SUID)
 
@@ -288,6 +222,7 @@ AC_SUBST(all_libraries)
 
 AC_OUTPUT(\
        Makefile \
+       macros/Makefile \
         lufsd/Makefile \
        filesystems/Makefile \
         filesystems/localfs/Makefile \
@@ -304,15 +239,20 @@ AC_OUTPUT(\
        kernel/Makefile \
        kernel/Linux/Makefile \
        kernel/Linux/2.4/Makefile \
-       kernel/Linux/2.5/Makefile \
+       kernel/Linux/2.6/Makefile \
+       kernel/Linux/modbin/Makefile \
        include/Makefile \
        docs/Makefile \
        man/Makefile \
        lufs.spec \
+       kernel/Linux/prepmod \
+       debian/changelog \
+       kernel/Linux/2.4/makefile \
+       kernel/Linux/2.6/makefile \
         )
 
 echo "###############################################################################"
 echo " supported filesystems: $opt_fs"
 echo -n " suid files: "
-if test $LUFS_SUID; then echo "lufsmnt & lufsumount."; else echo "none."; fi
+if test $LUFS_SUID; then echo "lufsmnt."; else echo "none."; fi
 echo "###############################################################################"