From a54f863a14edbbd2c5bd14774c8f1ead32ed7bf5 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 24 Nov 2008 11:16:19 -0800
Subject: [PATCH] Restructure autoconf around ./config directory

---
 autoconf/Makefile.am              |  1 -
 autogen.sh                        | 10 ++++------
 config/Makefile.am                |  3 +++
 {configs => config}/kernel        |  0
 {configs => config}/lustre        |  0
 {configs => config}/user          |  0
 {autoconf => config}/zfs-build.m4 |  6 +++---
 configs/Makefile.am               |  1 -
 configure.ac                      |  2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 autoconf/Makefile.am
 create mode 100644 config/Makefile.am
 rename {configs => config}/kernel (100%)
 rename {configs => config}/lustre (100%)
 rename {configs => config}/user (100%)
 rename {autoconf => config}/zfs-build.m4 (98%)
 delete mode 100644 configs/Makefile.am

diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
deleted file mode 100644
index 688e8fda44..0000000000
--- a/autoconf/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = zfs-build.m4
diff --git a/autogen.sh b/autogen.sh
index 7834426bb2..72bba5b035 100755
--- a/autogen.sh
+++ b/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
diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644
index 0000000000..d1fde7bb45
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = zfs-build.m4
+EXTRA_DIST = kernel user lustre
+
diff --git a/configs/kernel b/config/kernel
similarity index 100%
rename from configs/kernel
rename to config/kernel
diff --git a/configs/lustre b/config/lustre
similarity index 100%
rename from configs/lustre
rename to config/lustre
diff --git a/configs/user b/config/user
similarity index 100%
rename from configs/user
rename to config/user
diff --git a/autoconf/zfs-build.m4 b/config/zfs-build.m4
similarity index 98%
rename from autoconf/zfs-build.m4
rename to config/zfs-build.m4
index 773d42832f..5eebdd48e2 100644
--- a/autoconf/zfs-build.m4
+++ b/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
diff --git a/configs/Makefile.am b/configs/Makefile.am
deleted file mode 100644
index 326b3d7601..0000000000
--- a/configs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST=kernel user lustre
diff --git a/configure.ac b/configure.ac
index 7d099854b2..18cbb43ec8 100644
--- a/configure.ac
+++ b/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