Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

cmd/ztest/Makefile.am

@@ -28,3 +28,6 @@ ztest_LDADD = \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
 ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl
+
+check:
+	./ztest -V

configure.ac

@@ -60,7 +60,6 @@ AC_CONFIG_FILES([
 	Makefile
 	config/Makefile
 	doc/Makefile
-	scripts/Makefile
 	lib/Makefile
 	lib/libspl/Makefile
 	lib/libavl/Makefile
@@ -95,5 +94,6 @@ AC_CONFIG_FILES([
 	module/zfs/Makefile
 	module/zpios/Makefile
 	module/zpios/include/Makefile
+	scripts/Makefile
 ])
 AC_OUTPUT

scripts/Makefile.am

@@ -1,4 +1,5 @@
 EXTRA_DIST  = update-zfs.sh check.sh zfs.sh create-zpool.sh
 
 check:
-	./check.sh
+	./zfs.sh -v
+	./zfs.sh -vu

scripts/check.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-prog=check.sh
-
-die() {
-	echo "${prog}: $1" >&2
-	exit 1
-}
-
-if [ $(id -u) != 0 ]; then
-	die "Must run as root"
-fi
-
-./zfs.sh -v  || die ""
-./zfs.sh -vu || die ""
-
-exit 0