diff options
| author | Ryan Moeller <[email protected]> | 2019-06-04 18:05:46 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-06-07 12:45:40 -0700 |
| commit | d6920fb99677b93f3f2d94a9f34bdf9c3268bf21 (patch) | |
| tree | fdf3930199aa1ba48316ea056cccb60acbb444bf /cmd | |
| parent | 58b2de6420abfc60abcb280f82521a01ff8422af (diff) | |
Make Python detection optional and more portable
Previously, --without-python would cause ./configure to fail. Now it is
able to proceed, and the Python scripts will not be built.
Use portable parameter expansion matching instead of nonstandard
substring matching to detect the Python version. This test is
duplicated in several places, so define a function for it.
Don't assume the full path to binaries, since different platforms do
install things in different places. Use AC_CHECK_PROGS instead.
When building without Python, also build without pyzfs.
Sponsored by: iXsystems, Inc.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Eli Schwartz <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #8809
Closes #8731
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 9dd7b8b4f..0d990789b 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1,3 +1,8 @@ SUBDIRS = zfs zpool zdb zhack zinject zstreamdump ztest -SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat dbufstat zed -SUBDIRS += arc_summary raidz_test zgenhostid +SUBDIRS += fsck_zfs vdev_id raidz_test zgenhostid + +if USING_PYTHON +SUBDIRS += arcstat arc_summary dbufstat +endif + +SUBDIRS += mount_zfs zed zvol_id |