X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fzfs-build.m4;h=005185b038115484c426faf80a3871909ac793fd;hb=bce45ec9fb7bcdd8c306ccc7fc1ecc7f29cecbf5;hp=6bfea51951ce4275b24268ce312bc374e16d6da0;hpb=1c5de20ae2511124613926e4f780572634818218;p=zfs.git

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 6bfea51..005185b 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -73,6 +73,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 		AS_HELP_STRING([--with-config=CONFIG],
 		[Config file 'kernel|user|all|srpm']),
 		[ZFS_CONFIG="$withval"])
+	AC_ARG_ENABLE([linux-builtin],
+		[AC_HELP_STRING([--enable-linux-builtin],
+		[Configure for builtin in-tree kernel modules @<:@default=no@:>@])],
+		[],
+		[enable_linux_builtin=no])
 
 	AC_MSG_CHECKING([zfs config])
 	AC_MSG_RESULT([$ZFS_CONFIG]);
@@ -93,11 +98,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 	esac
 
 	AM_CONDITIONAL([CONFIG_USER],
-	               [test "$ZFS_CONFIG" = user] ||
-	               [test "$ZFS_CONFIG" = all])
+		       [test "$ZFS_CONFIG" = user -o "$ZFS_CONFIG" = all])
 	AM_CONDITIONAL([CONFIG_KERNEL],
-	               [test "$ZFS_CONFIG" = kernel] ||
-	               [test "$ZFS_CONFIG" = all])
+		       [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] &&
+		       [test "x$enable_linux_builtin" != xyes ])
 ])
 
 dnl #
@@ -105,6 +109,11 @@ dnl # Check for rpm+rpmbuild to build RPM packages.  If these tools
 dnl # are missing it is non-fatal but you will not be able to build
 dnl # RPM packages and will be warned if you try too.
 dnl #
+dnl # By default the generic spec file will be used because it requires
+dnl # minimal dependencies.  Distribution specific spec files can be
+dnl # placed under the 'rpm/<distribution>' directory and enabled using
+dnl # the --with-spec=<distribution> configure option.
+dnl #
 AC_DEFUN([ZFS_AC_RPM], [
 	RPM=rpm
 	RPMBUILD=rpmbuild
@@ -129,6 +138,25 @@ AC_DEFUN([ZFS_AC_RPM], [
 		AC_MSG_RESULT([$HAVE_RPMBUILD])
 	])
 
+	RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1" --define "$(DEBUG_DMU_TX) 1"'
+	RPM_DEFINE_UTIL=
+	RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
+	RPM_DEFINE_DKMS=
+
+	SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
+	SRPM_DEFINE_UTIL=
+	SRPM_DEFINE_KMOD=
+	SRPM_DEFINE_DKMS=
+
+	RPM_SPEC_DIR="rpm/generic"
+	AC_ARG_WITH([spec],
+		AS_HELP_STRING([--with-spec=SPEC],
+		[Spec files 'generic|fedora']),
+		[RPM_SPEC_DIR="rpm/$withval"])
+
+	AC_MSG_CHECKING([whether spec files are available])
+	AC_MSG_RESULT([yes ($RPM_SPEC_DIR/*.spec.in)])
+
 	AC_SUBST(HAVE_RPM)
 	AC_SUBST(RPM)
 	AC_SUBST(RPM_VERSION)
@@ -136,6 +164,16 @@ AC_DEFUN([ZFS_AC_RPM], [
 	AC_SUBST(HAVE_RPMBUILD)
 	AC_SUBST(RPMBUILD)
 	AC_SUBST(RPMBUILD_VERSION)
+
+	AC_SUBST(RPM_SPEC_DIR)
+	AC_SUBST(RPM_DEFINE_UTIL)
+	AC_SUBST(RPM_DEFINE_KMOD)
+	AC_SUBST(RPM_DEFINE_DKMS)
+	AC_SUBST(RPM_DEFINE_COMMON)
+	AC_SUBST(SRPM_DEFINE_UTIL)
+	AC_SUBST(SRPM_DEFINE_KMOD)
+	AC_SUBST(SRPM_DEFINE_DKMS)
+	AC_SUBST(SRPM_DEFINE_COMMON)
 ])
 
 dnl #
@@ -202,48 +240,6 @@ AC_DEFUN([ZFS_AC_ALIEN], [
 ])
 
 dnl #
-dnl # Check for pacman+makepkg to build Arch Linux packages.  If these
-dnl # tools are missing it is non-fatal but you will not be able to
-dnl # build Arch Linux packages and will be warned if you try too.
-dnl #
-AC_DEFUN([ZFS_AC_PACMAN], [
-	PACMAN=pacman
-	MAKEPKG=makepkg
-
-	AC_MSG_CHECKING([whether $PACMAN is available])
-	tmp=$($PACMAN --version 2>/dev/null)
-	AS_IF([test -n "$tmp"], [
-		PACMAN_VERSION=$(echo $tmp |
-		                 $AWK '/Pacman/ { print $[3] }' |
-		                 $SED 's/^v//')
-		HAVE_PACMAN=yes
-		AC_MSG_RESULT([$HAVE_PACMAN ($PACMAN_VERSION)])
-	],[
-		HAVE_PACMAN=no
-		AC_MSG_RESULT([$HAVE_PACMAN])
-	])
-
-	AC_MSG_CHECKING([whether $MAKEPKG is available])
-	tmp=$($MAKEPKG --version 2>/dev/null)
-	AS_IF([test -n "$tmp"], [
-		MAKEPKG_VERSION=$(echo $tmp | $AWK '/makepkg/ { print $[3] }')
-		HAVE_MAKEPKG=yes
-		AC_MSG_RESULT([$HAVE_MAKEPKG ($MAKEPKG_VERSION)])
-	],[
-		HAVE_MAKEPKG=no
-		AC_MSG_RESULT([$HAVE_MAKEPKG])
-	])
-
-	AC_SUBST(HAVE_PACMAN)
-	AC_SUBST(PACMAN)
-	AC_SUBST(PACMAN_VERSION)
-
-	AC_SUBST(HAVE_MAKEPKG)
-	AC_SUBST(MAKEPKG)
-	AC_SUBST(MAKEPKG_VERSION)
-])
-
-dnl #
 dnl # Using the VENDOR tag from config.guess set the default
 dnl # package type for 'make pkg': (rpm | deb | tgz)
 dnl #
@@ -281,7 +277,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		redhat)     DEFAULT_PACKAGE=rpm  ;;
 		fedora)     DEFAULT_PACKAGE=rpm  ;;
 		gentoo)     DEFAULT_PACKAGE=tgz  ;;
-		arch)       DEFAULT_PACKAGE=arch ;;
+		arch)       DEFAULT_PACKAGE=tgz  ;;
 		sles)       DEFAULT_PACKAGE=rpm  ;;
 		slackware)  DEFAULT_PACKAGE=tgz  ;;
 		lunar)      DEFAULT_PACKAGE=tgz  ;;
@@ -293,12 +289,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 	AC_MSG_RESULT([$DEFAULT_PACKAGE])
 	AC_SUBST(DEFAULT_PACKAGE)
 
+	DEFAULT_INIT_DIR=$sysconfdir/init.d
 	AC_MSG_CHECKING([default init directory])
-	case "$VENDOR" in
-		arch)       DEFAULT_INIT_DIR=$sysconfdir/rc.d ;;
-		*)          DEFAULT_INIT_DIR=$sysconfdir/init.d ;;
-	esac
-
 	AC_MSG_RESULT([$DEFAULT_INIT_DIR])
 	AC_SUBST(DEFAULT_INIT_DIR)
 
@@ -308,7 +300,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
 		fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
 		gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
-		arch)       DEFAULT_INIT_SCRIPT=arch   ;;
+		arch)       DEFAULT_INIT_SCRIPT=lsb    ;;
 		sles)       DEFAULT_INIT_SCRIPT=lsb    ;;
 		slackware)  DEFAULT_INIT_SCRIPT=lsb    ;;
 		lunar)      DEFAULT_INIT_SCRIPT=lunar  ;;
@@ -329,6 +321,4 @@ AC_DEFUN([ZFS_AC_PACKAGE], [
 	ZFS_AC_RPM
 	ZFS_AC_DPKG
 	ZFS_AC_ALIEN
-
-	AS_IF([test "$VENDOR" = "arch"], [ZFS_AC_PACMAN])
 ])