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
d693f67
..
2b79f5f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-92,6
+92,7
@@
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/ztest/Makefile
cmd/zpios/Makefile
cmd/mount_zfs/Makefile
@@
-123,6
+124,8
@@
AC_CONFIG_FILES([
PKGBUILD-zfs
PKGBUILD-zfs-modules
zfs-script-config.sh
PKGBUILD-zfs
PKGBUILD-zfs-modules
zfs-script-config.sh
+ zfs.release
+ dkms.conf
])
AC_OUTPUT
])
AC_OUTPUT