git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-3.6'
[zfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
c84d60d
..
2b79f5f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-52,6
+52,7
@@
ZFS_AC_LICENSE
ZFS_AC_PACKAGE
ZFS_AC_CONFIG
ZFS_AC_DEBUG
ZFS_AC_PACKAGE
ZFS_AC_CONFIG
ZFS_AC_DEBUG
+ZFS_AC_DEBUG_DMU_TX
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile
@@
-63,6
+64,7
@@
AC_CONFIG_FILES([
etc/init.d/Makefile
etc/zfs/Makefile
man/Makefile
etc/init.d/Makefile
etc/zfs/Makefile
man/Makefile
+ man/man5/Makefile
man/man8/Makefile
lib/Makefile
lib/libspl/Makefile
man/man8/Makefile
lib/Makefile
lib/libspl/Makefile
@@
-90,13
+92,14
@@
AC_CONFIG_FILES([
cmd/zfs/Makefile
cmd/zinject/Makefile
cmd/zpool/Makefile
cmd/zfs/Makefile
cmd/zinject/Makefile
cmd/zpool/Makefile
+ cmd/zstreamdump/Makefile
cmd/ztest/Makefile
cmd/zpios/Makefile
cmd/mount_zfs/Makefile
cmd/zpool_layout/Makefile
cmd/zvol_id/Makefile
cmd/zpool_id/Makefile
cmd/ztest/Makefile
cmd/zpios/Makefile
cmd/mount_zfs/Makefile
cmd/zpool_layout/Makefile
cmd/zvol_id/Makefile
cmd/zpool_id/Makefile
- cmd/
sas_switch
_id/Makefile
+ cmd/
vdev
_id/Makefile
module/Makefile
module/avl/Makefile
module/nvpair/Makefile
module/Makefile
module/avl/Makefile
module/nvpair/Makefile
@@
-118,7
+121,11
@@
AC_CONFIG_FILES([
scripts/common.sh
zfs.spec
zfs-modules.spec
scripts/common.sh
zfs.spec
zfs-modules.spec
+ PKGBUILD-zfs
+ PKGBUILD-zfs-modules
zfs-script-config.sh
zfs-script-config.sh
+ zfs.release
+ dkms.conf
])
AC_OUTPUT
])
AC_OUTPUT