diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-10-14 21:20:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-10-14 21:20:20 +0200 |
| commit | 301af6aff4c4005749c3346caa7c087933110242 (patch) | |
| tree | 7c1e89eb229463d9dcb6912ef9d009092e6e7049 | |
| parent | a0140f2e8791d39dadb9cbb867c0378de9368763 (diff) | |
| parent | dd6e5ef16dfedb62b8349f1884b9a0e171fbb310 (diff) | |
Merge remote-tracking branch 'origin/main' into v1.9.xv1.9.23
| -rw-r--r-- | wscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,7 +35,7 @@ import subprocess import os import sys import shlex -import distutils.spawn +import shutil from waflib import Logs, Context APPNAME = 'libdcp' @@ -138,7 +138,7 @@ def configure(conf): # ImageMagick / GraphicsMagick if (not conf.options.disable_examples) and (not conf.options.disable_dumpimage): - if distutils.spawn.find_executable('Magick++-config'): + if shutil.which('Magick++-config'): conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True, msg='Checking for ImageMagick/GraphicsMagick') else: image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) |
