diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 18:45:55 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 18:45:55 +0200 |
commit | a77bc1fcbdf83cfdac9570c0a0ac886b5534c90f (patch) | |
tree | d839746371ecb8ed64ac81d2e37c11fcd25a00ac /acinclude.m4 | |
parent | 787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff) | |
parent | 2b3e02411ecc09e7d41741b5587655c9b2f955b7 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7c90c64..e10f8ce 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -613,7 +613,7 @@ for be in ${BACKENDS}; do ;; escl) - if test "x${enable_avahi}" != "xyes"; then + if test "x${with_avahi}" != "xyes"; then echo "*** $be backend requires AVAHI library - $DISABLE_MSG" backend_supported="no" fi @@ -629,7 +629,14 @@ for be in ${BACKENDS}; do if test "x${sane_cv_use_libjpeg}" != "xyes"; then echo "*** $be backend currently requires JPEG library - $DISABLE_MSG" backend_supported="no" + else + if test "x${ac_cv_func_jpeg_crop_scanline}" != "xyes" \ + || test "x${ac_cv_func_jpeg_skip_scanlines}" != "xyes"; then + echo "*** $be backend requires a newer JPEG library - $DISABLE_MSG" + backend_supported="no" + fi fi + ;; gphoto2) |