Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-m…

…odule
mitra · Nov 24, 2009 · a9696ab · a9696ab
2 parents b2db102 + c8bd25a
commit a9696ab
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
@@ -98,18 +98,20 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 	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
 	AC_ARG_WITH([config],
 		AS_HELP_STRING([--with-config=CONFIG],
-		[Config file 'kernel|user|all']),
+		[Config file 'kernel|user|all|srpm']),
 		[ZFS_CONFIG="$withval"])
 
 	AC_MSG_CHECKING([zfs config])
@@ -121,10 +123,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 		user)	ZFS_AC_CONFIG_USER   ;;
 		all)    ZFS_AC_CONFIG_KERNEL
 			ZFS_AC_CONFIG_USER   ;;
+		srpm)                        ;;
 		*)
 		AC_MSG_RESULT([Error!])
 		AC_MSG_ERROR([Bad value "$ZFS_CONFIG" for --with-config,
-		              user kernel|user|all]) ;;
+		              user kernel|user|all|srpm]) ;;
 	esac
 
 	AM_CONDITIONAL([CONFIG_USER],