First step of META build system cleanup

[zfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7d09985..bbbc4ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,12 @@
 
 AC_INIT
 AC_LANG(C)
-
+ZFS_AC_META
+AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(zfs, 0.4.0)
+AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION])
 AC_CONFIG_HEADERS([zfs_config.h])
+AM_MAINTAINER_MODE
 
 AC_PROG_INSTALL
 AC_PROG_CC
@@ -55,18 +57,6 @@ ZFS_AC_LICENSE
 ZFS_AC_DEBUG
 ZFS_AC_2ARGS_BIO_END_IO_T
 
-AC_SUBST(UNAME)
-AC_SUBST(CONFIG)
-AC_SUBST(NAME)
-AC_SUBST(SVNURL)
-AC_SUBST(BRANCH)
-AC_SUBST(VERSION)
-AC_SUBST(RELEASE)
-AC_SUBST(BRANCHURL)
-AC_SUBST(TAGURL)
-AC_SUBST(BUILDURL)
-AC_SUBST(BUILDDIR)
-
 # Check for needed userspace bits
 AC_CHECK_HEADERS(sys/types.h sys/byteorder.h sys/isa_defs.h \
                  sys/systeminfo.h sys/u8_textprep.h libdiskmgt.h)
@@ -137,8 +127,7 @@ AC_SUBST(KERNELCPPFLAGS)
 AC_SUBST(HOSTCFLAGS)
 
 AC_CONFIG_FILES([ Makefile
-                  autoconf/Makefile
-                  configs/Makefile
+                  config/Makefile
                   doc/Makefile
                   scripts/Makefile
                   zfs/Makefile