Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

autoconf/Makefile.am

@@ -1 +0,0 @@
-EXTRA_DIST = zfs-build.m4

autogen.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 
-find . -type d -name .deps | xargs rm -rf
-rm -rf config.guess config.sub ltmain.sh
-libtoolize --automake
-aclocal -I autoconf 2>/dev/null &&
+aclocal -I config &&
+libtoolize --automake --copy
 autoheader &&
-automake --add-missing --include-deps # 2>/dev/null &&
+automake --add-missing --include-deps 2>/dev/null
 autoconf
-
+rm -rf autom4te.cache aclocal.m4

config/Makefile.am

@@ -0,0 +1,3 @@
+EXTRA_DIST = zfs-build.m4
+EXTRA_DIST = kernel user lustre
+

config/zfs-build.m4

@@ -6,15 +6,15 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 		[zfsconfig="$withval"])
 
 	AC_MSG_CHECKING([zfs config file])
-	if test -z "$zfsconfig" || test ! -r configs/$zfsconfig; then
+	if test -z "$zfsconfig" || test ! -r config/$zfsconfig; then
 		AC_MSG_RESULT([no])
 		AC_MSG_ERROR([
 	        *** Please specify one of the valid config files located
-	        *** in ./configs/ with the '--with-zfs-config=CONFIG' option])
+	        *** in ./config/ with the '--with-zfs-config=CONFIG' option])
 	fi
 
 	AC_MSG_RESULT([$zfsconfig]);
-	. ./configs/$zfsconfig
+	. ./config/$zfsconfig
 
 	TOPDIR=`/bin/pwd`
 	ZFSDIR=${TOPDIR}/$BUILDDIR

configs/Makefile.am

@@ -1 +0,0 @@
-EXTRA_DIST=kernel user lustre

configure.ac

@@ -138,7 +138,7 @@ AC_SUBST(HOSTCFLAGS)
 
 AC_CONFIG_FILES([ Makefile
                   autoconf/Makefile
-                  configs/Makefile
+                  config/Makefile
                   doc/Makefile
                   scripts/Makefile
                   zfs/Makefile