Fix import wrong spare/l2 device when path change

[mirror_zfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41cd00758119d2a8ae7032c25896314ed61a6622..06b6662fd0edad8bdfee5cdb756ba57ed8dd72a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_HEADERS([zfs_config.h], [
        (mv zfs_config.h zfs_config.h.tmp &&
        awk -f ${ac_srcdir}/config/config.awk zfs_config.h.tmp >zfs_config.h &&
@@ -49,12 +49,12 @@ AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LIBTOOL
 AM_PROG_AS
+AM_PROG_CC_C_O
 
 ZFS_AC_LICENSE
 ZFS_AC_PACKAGE
 ZFS_AC_CONFIG
 ZFS_AC_DEBUG
-ZFS_AC_DEBUG_DMU_TX
 
 AC_CONFIG_FILES([
        Makefile
@@ -80,11 +80,11 @@ AC_CONFIG_FILES([
        lib/libspl/include/ia32/sys/Makefile
        lib/libspl/include/rpc/Makefile
        lib/libspl/include/sys/Makefile
-       lib/libspl/include/sys/sysevent/Makefile
        lib/libspl/include/sys/dktp/Makefile
        lib/libspl/include/util/Makefile
        lib/libavl/Makefile
        lib/libefi/Makefile
+       lib/libicp/Makefile
        lib/libnvpair/Makefile
        lib/libunicode/Makefile
        lib/libuutil/Makefile
@@ -111,9 +111,11 @@ AC_CONFIG_FILES([
        cmd/dbufstat/Makefile
        cmd/arc_summary/Makefile
        cmd/zed/Makefile
+       cmd/raidz_test/Makefile
        contrib/Makefile
        contrib/bash_completion.d/Makefile
        contrib/dracut/Makefile
+       contrib/dracut/02zfsexpandknowledge/Makefile
        contrib/dracut/90zfs/Makefile
        contrib/initramfs/Makefile
        module/Makefile
@@ -123,12 +125,15 @@ AC_CONFIG_FILES([
        module/zcommon/Makefile
        module/zfs/Makefile
        module/zpios/Makefile
+       module/icp/Makefile
        include/Makefile
        include/linux/Makefile
        include/sys/Makefile
        include/sys/fs/Makefile
        include/sys/fm/Makefile
        include/sys/fm/fs/Makefile
+       include/sys/crypto/Makefile
+       include/sys/sysevent/Makefile
        scripts/Makefile
        scripts/zpios-profile/Makefile
        scripts/zpios-test/Makefile
@@ -141,6 +146,7 @@ AC_CONFIG_FILES([
        tests/test-runner/man/Makefile
        tests/runfiles/Makefile
        tests/zfs-tests/Makefile
+       tests/zfs-tests/callbacks/Makefile
        tests/zfs-tests/cmd/Makefile
        tests/zfs-tests/cmd/chg_usr_exec/Makefile
        tests/zfs-tests/cmd/devname2devid/Makefile
@@ -162,7 +168,6 @@ AC_CONFIG_FILES([
        tests/zfs-tests/cmd/threadsappend/Makefile
        tests/zfs-tests/cmd/xattrtest/Makefile
        tests/zfs-tests/include/Makefile
-       tests/zfs-tests/include/commands.cfg
        tests/zfs-tests/include/default.cfg
        tests/zfs-tests/tests/Makefile
        tests/zfs-tests/tests/functional/Makefile
@@ -173,6 +178,8 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/cache/Makefile
        tests/zfs-tests/tests/functional/cachefile/Makefile
        tests/zfs-tests/tests/functional/casenorm/Makefile
+       tests/zfs-tests/tests/functional/checksum/Makefile
+       tests/zfs-tests/tests/functional/chattr/Makefile
        tests/zfs-tests/tests/functional/clean_mirror/Makefile
        tests/zfs-tests/tests/functional/cli_root/Makefile
        tests/zfs-tests/tests/functional/cli_root/zdb/Makefile
@@ -208,6 +215,7 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile
+       tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile
@@ -216,6 +224,7 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile
+       tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile
        tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile
        tests/zfs-tests/tests/functional/cli_user/Makefile
        tests/zfs-tests/tests/functional/cli_user/misc/Makefile
@@ -226,8 +235,11 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/ctime/Makefile
        tests/zfs-tests/tests/functional/delegate/Makefile
        tests/zfs-tests/tests/functional/devices/Makefile
+       tests/zfs-tests/tests/functional/events/Makefile
        tests/zfs-tests/tests/functional/exec/Makefile
+       tests/zfs-tests/tests/functional/fault/Makefile
        tests/zfs-tests/tests/functional/features/async_destroy/Makefile
+       tests/zfs-tests/tests/functional/features/large_dnode/Makefile
        tests/zfs-tests/tests/functional/features/Makefile
        tests/zfs-tests/tests/functional/grow_pool/Makefile
        tests/zfs-tests/tests/functional/grow_replicas/Makefile
@@ -237,6 +249,7 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/large_files/Makefile
        tests/zfs-tests/tests/functional/largest_pool/Makefile
        tests/zfs-tests/tests/functional/link_count/Makefile
+       tests/zfs-tests/tests/functional/libzfs/Makefile
        tests/zfs-tests/tests/functional/migration/Makefile
        tests/zfs-tests/tests/functional/mmap/Makefile
        tests/zfs-tests/tests/functional/mount/Makefile
@@ -249,6 +262,7 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/poolversion/Makefile
        tests/zfs-tests/tests/functional/privilege/Makefile
        tests/zfs-tests/tests/functional/quota/Makefile
+       tests/zfs-tests/tests/functional/raidz/Makefile
        tests/zfs-tests/tests/functional/redundancy/Makefile
        tests/zfs-tests/tests/functional/refquota/Makefile
        tests/zfs-tests/tests/functional/refreserv/Makefile
@@ -263,8 +277,11 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/snapused/Makefile
        tests/zfs-tests/tests/functional/sparse/Makefile
        tests/zfs-tests/tests/functional/threadsappend/Makefile
+       tests/zfs-tests/tests/functional/tmpfile/Makefile
        tests/zfs-tests/tests/functional/truncate/Makefile
        tests/zfs-tests/tests/functional/userquota/Makefile
+       tests/zfs-tests/tests/functional/upgrade/Makefile
+       tests/zfs-tests/tests/functional/vdev_zaps/Makefile
        tests/zfs-tests/tests/functional/write_dirs/Makefile
        tests/zfs-tests/tests/functional/xattr/Makefile
        tests/zfs-tests/tests/functional/zvol/Makefile
@@ -272,6 +289,10 @@ AC_CONFIG_FILES([
        tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile
        tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile
        tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile
+       tests/zfs-tests/tests/perf/Makefile
+       tests/zfs-tests/tests/perf/fio/Makefile
+       tests/zfs-tests/tests/perf/regression/Makefile
+       tests/zfs-tests/tests/perf/scripts/Makefile
        tests/zfs-tests/tests/stress/Makefile
        rpm/Makefile
        rpm/redhat/Makefile
@@ -286,4 +307,5 @@ AC_CONFIG_FILES([
        zfs.release
 ])
 
+
 AC_OUTPUT