Restructure autoconf around ./config directory

diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
deleted file mode 100644 (file)
index 688e8fd..0000000
--- a/autoconf/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = zfs-build.m4

diff --git a/autogen.sh b/autogen.sh
index 7834426..72bba5b 100755 (executable)
--- 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 (file)
index 0000000..d1fde7b
--- /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 773d428..5eebdd4 100644 (file)
--- 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 (file)
index 326b3d7..0000000
--- a/configs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST=kernel user lustre

diff --git a/configure.ac b/configure.ac
index 7d09985..18cbb43 100644 (file)
--- 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