diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
| commit | 7e9455b3b15671ff99ed168638c405e2acedb6df (patch) | |
| tree | 444e59ece236e09dc153f665e42160aeb0208c24 /acinclude.m4 | |
| parent | bc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff) | |
| parent | bce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff) | |
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
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) |