X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fzfs-build.m4;h=3ea77abd653c70a2e5e66e11f29b9be73fe5f7b8;hb=055656d4f4dfc1a85646a2c0cc10b9dce86da72b;hp=b88003585ba2d7d6071376729904a2ea01eeb11c;hpb=c9c0d073da561bcbefbdf09c87fc75b227415619;p=zfs.git

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index b880035..3ea77ab 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -33,81 +33,8 @@ AC_DEFUN([ZFS_AC_DEBUG], [
 	AC_MSG_RESULT([$enable_debug])
 ])
 
-AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [
-	cat >.script-config <<EOF
-KERNELSRC=${LINUX}
-KERNELBUILD=${LINUX_OBJ}
-KERNELSRCVER=${LINUX_VERSION}
-KERNELMOD=/lib/modules/\${KERNELSRCVER}/kernel
-
-SPLSRC=${SPL}
-SPLBUILD=${SPL_OBJ}
-SPLSRCVER=${SPL_VERSION}
-
-TOPDIR=${TOPDIR}
-BUILDDIR=${BUILDDIR}
-LIBDIR=${LIBDIR}
-CMDDIR=${CMDDIR}
-MODDIR=${MODDIR}
-SCRIPTDIR=${SCRIPTDIR}
-ETCDIR=\${TOPDIR}/etc
-DEVDIR=\${TOPDIR}/dev
-ZPOOLDIR=\${TOPDIR}/scripts/zpool-config
-
-ZDB=\${CMDDIR}/zdb/zdb
-ZFS=\${CMDDIR}/zfs/zfs
-ZINJECT=\${CMDDIR}/zinject/zinject
-ZPOOL=\${CMDDIR}/zpool/zpool
-ZPOOL_ID=\${CMDDIR}/zpool_id/zpool_id
-ZTEST=\${CMDDIR}/ztest/ztest
-
-COMMON_SH=\${SCRIPTDIR}/common.sh
-ZFS_SH=\${SCRIPTDIR}/zfs.sh
-ZPOOL_CREATE_SH=\${SCRIPTDIR}/zpool-create.sh
-
-INTREE=1
-LDMOD=/sbin/insmod
-
-KERNEL_MODULES=(                                      \\
-        \${KERNELMOD}/lib/zlib_deflate/zlib_deflate.ko \\
-)
-
-SPL_MODULES=(                                         \\
-        \${SPLBUILD}/spl/spl.ko                        \\
-        \${SPLBUILD}/splat/splat.ko                    \\
-)
-
-ZFS_MODULES=(                                         \\
-        \${MODDIR}/avl/zavl.ko                         \\
-        \${MODDIR}/nvpair/znvpair.ko                   \\
-        \${MODDIR}/unicode/zunicode.ko                 \\
-        \${MODDIR}/zcommon/zcommon.ko                  \\
-        \${MODDIR}/zfs/zfs.ko                          \\
-)
-
-MODULES=(                                             \\
-        \${KERNEL_MODULES[[*]]}                          \\
-        \${SPL_MODULES[[*]]}                             \\
-        \${ZFS_MODULES[[*]]}                             \\
-)
-EOF
-])
-
 AC_DEFUN([ZFS_AC_CONFIG], [
-	TOPDIR=`readlink -f ${srcdir}`
-	BUILDDIR=$TOPDIR
-	LIBDIR=$TOPDIR/lib
-	CMDDIR=$TOPDIR/cmd
-	MODDIR=$TOPDIR/module
-	SCRIPTDIR=$TOPDIR/scripts
 	TARGET_ASM_DIR=asm-generic
-
-	AC_SUBST(TOPDIR)
-	AC_SUBST(BUILDDIR)
-	AC_SUBST(LIBDIR)
-	AC_SUBST(CMDDIR)
-	AC_SUBST(MODDIR)
-	AC_SUBST(SCRIPTDIR)
 	AC_SUBST(TARGET_ASM_DIR)
 
 	ZFS_CONFIG=all
@@ -138,8 +65,6 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 	AM_CONDITIONAL([CONFIG_KERNEL],
 	               [test "$ZFS_CONFIG" = kernel] ||
 	               [test "$ZFS_CONFIG" = all])
-
-	ZFS_AC_CONFIG_SCRIPT
 ])
 
 dnl #
@@ -253,10 +178,10 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		VENDOR=redhat ;
 	elif test -f /etc/fedora-release ; then
 		VENDOR=fedora ;
-	elif test -f /etc/debian_version ; then
-		VENDOR=debian ;
 	elif test -f /etc/lsb-release ; then
 		VENDOR=ubuntu ;
+	elif test -f /etc/debian_version ; then
+		VENDOR=debian ;
 	elif test -f /etc/SuSE-release ; then
 		VENDOR=sles ;
 	elif test -f /etc/slackware-version ; then
@@ -282,6 +207,20 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 
 	AC_MSG_RESULT([$DEFAULT_PACKAGE])
 	AC_SUBST(DEFAULT_PACKAGE)
+
+	AC_MSG_CHECKING([default init script type])
+	case "$VENDOR" in
+		fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
+		redhat)     DEFAULT_INIT_SCRIPT=fedora ;;
+		sles)       DEFAULT_INIT_SCRIPT=lsb ;;
+		ubuntu)     DEFAULT_INIT_SCRIPT=lsb ;;
+		debian)     DEFAULT_INIT_SCRIPT=lsb ;;
+		slackware)  DEFAULT_INIT_SCRIPT=lsb ;;
+		*)          DEFAULT_INIT_SCRIPT=lsb ;;
+	esac
+
+	AC_MSG_RESULT([$DEFAULT_INIT_SCRIPT])
+	AC_SUBST(DEFAULT_INIT_SCRIPT)
 ])
 
 dnl #