diff options
| author | Dirk Lemstra <dirk@lemstra.org> | 2020-12-29 01:31:45 +0100 |
|---|---|---|
| committer | Dirk Lemstra <dirk@lemstra.org> | 2020-12-29 01:31:45 +0100 |
| commit | 133411f2d9008bda202f275a35c3b39ea2e8e69d (patch) | |
| tree | a0488491b65e56374da72957ab81e66e7aede16f | |
| parent | af9793ebaad6031d0d832df8c194b7b18d16e907 (diff) | |
| download | ImageMagick-133411f2d9008bda202f275a35c3b39ea2e8e69d.tar.gz | |
Disable jpeg-xl in the static build unless ImageMagick is build without the utilities.
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c6a8f3e2e..3051ce817 100644 --- a/configure.ac +++ b/configure.ac @@ -2368,6 +2368,11 @@ AC_ARG_WITH([jxl], if test "$with_jxl" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl " fi +if test "$enable_static" = 'yes'; then + if test "$with_utilities" = 'yes'; then + with_jxl='no' + fi +fi # Check for the JPEG-XL library. have_jxl='no' @@ -2380,9 +2385,11 @@ if test "$with_jxl" != 'no'; then passed=0 AC_CHECK_HEADER([jxl/decode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) AC_CHECK_HEADER([jxl/encode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - AC_CHECK_LIB([jxl],[JxlDecoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) - - AC_CHECK_LIB([jxl],[JxlEncoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) + # This check should be changed once we have a .pc file for the JPEG-XL library. + if test "$enable_static" != 'yes'; then + AC_CHECK_LIB([jxl],[JxlDecoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) + AC_CHECK_LIB([jxl],[JxlEncoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) + fi AC_MSG_CHECKING([if jpeg-xl package is complete]) if test $passed -gt 0; then |