summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-10-14 21:20:20 +0200
committerCarl Hetherington <cth@carlh.net>2024-10-14 21:20:20 +0200
commit301af6aff4c4005749c3346caa7c087933110242 (patch)
tree7c1e89eb229463d9dcb6912ef9d009092e6e7049
parenta0140f2e8791d39dadb9cbb867c0378de9368763 (diff)
parentdd6e5ef16dfedb62b8349f1884b9a0e171fbb310 (diff)
Merge remote-tracking branch 'origin/main' into v1.9.xv1.9.23
-rw-r--r--wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript b/wscript
index 6c350fb4..ba62d86d 100644
--- a/wscript
+++ b/wscript
@@ -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)