Merge tag 'upstream/0.6.5.5'

[mirror_spl-debian.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 27d3356ecbe0260c71c13fe7f68c0420bdb55447..efeb243cba692f6b5fc751de65259378fb81b512 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
 # UCRL-CODE-235197
 #
 # This file is part of the SPL, Solaris Porting Layer.
-# For details, see <http://github.com/behlendorf/spl/>.
+# For details, see <http://zfsonlinux.org/>.
 #
 # The SPL is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -24,14 +24,16 @@
 # with the SPL.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-AC_INIT
+AC_INIT(m4_esyscmd(grep Name META | cut -d ':' -f 2 | tr -d ' \n'),
+       m4_esyscmd(grep Version META | cut -d ':' -f 2 | tr -d ' \n'))
 AC_LANG(C)
 SPL_AC_META
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
-AM_SILENT_RULES
-AM_INIT_AUTOMAKE([$SPL_META_NAME], [$SPL_META_VERSION])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([spl_config.h], [
        (mv spl_config.h spl_config.h.tmp &&
        awk -f ${ac_srcdir}/config/config.awk spl_config.h.tmp >spl_config.h &&
@@ -47,19 +49,36 @@ SPL_AC_CONFIG
 
 AC_CONFIG_FILES([
        Makefile
+       man/Makefile
+       man/man1/Makefile
+       man/man5/Makefile
        lib/Makefile
        cmd/Makefile
        module/Makefile
        module/spl/Makefile
        module/splat/Makefile
        include/Makefile
+       include/fs/Makefile
+       include/linux/Makefile
+       include/rpc/Makefile
+       include/sharefs/Makefile
+       include/sys/Makefile
+       include/sys/fm/Makefile
+       include/sys/fs/Makefile
+       include/sys/sysevent/Makefile
+       include/util/Makefile
+       include/vm/Makefile
        scripts/Makefile
-       spl.spec
-       spl-modules.spec
-       PKGBUILD-spl
-       PKGBUILD-spl-modules
+       rpm/Makefile
+       rpm/redhat/Makefile
+       rpm/redhat/spl.spec
+       rpm/redhat/spl-kmod.spec
+       rpm/redhat/spl-dkms.spec
+       rpm/generic/Makefile
+       rpm/generic/spl.spec
+       rpm/generic/spl-kmod.spec
+       rpm/generic/spl-dkms.spec
        spl.release
-       dkms.conf
 ])
 
 AC_OUTPUT