diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-02-02 17:14:32 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-02-02 17:14:32 +0100 |
| commit | 5dadc28ea784db1ba1f56c2ea8618d2db67af1c8 (patch) | |
| tree | 808b2499b54563b3290f34d70d159b1024310873 /acinclude.m4 | |
| parent | 5bb4cf12855ec0151de15d6c5a2354ff08766957 (diff) | |
| parent | 3dade5db2a37543f19f0967901d8d80a52a1e459 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1bc3b74..7c90c64 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -252,21 +252,22 @@ AC_DEFUN([SANE_CHECK_PTHREAD], [Define if pthread_t is integer.]) else # Until the sanei_thread implementation is fixed. - have_pthread=no use_pthread=no fi + if test "$have_pthread" = "yes" ; then + AM_CPPFLAGS="${AM_CPPFLAGS} -D_REENTRANT" + fi + AC_SUBST(PTHREAD_LIBS) + if test $use_pthread = yes ; then AC_DEFINE_UNQUOTED(USE_PTHREAD, "$use_pthread", [Define if pthreads should be used instead of forked processes.]) + SANEI_THREAD_LIBS=$PTHREAD_LIBS else - dnl Reset library in case it was found but we are not going to use it. - PTHREAD_LIBS="" + SANEI_THREAD_LIBS="" fi - if test "$have_pthread" = "yes" ; then - AM_CPPFLAGS="${AM_CPPFLAGS} -D_REENTRANT" - fi - AC_SUBST(PTHREAD_LIBS) + AC_SUBST(SANEI_THREAD_LIBS) AC_MSG_CHECKING([whether to enable pthread support]) AC_MSG_RESULT([$have_pthread]) AC_MSG_CHECKING([whether to use pthread instead of fork]) @@ -611,6 +612,26 @@ for be in ${BACKENDS}; do fi ;; + escl) + if test "x${enable_avahi}" != "xyes"; then + echo "*** $be backend requires AVAHI library - $DISABLE_MSG" + backend_supported="no" + fi + if test "x${with_libcurl}" != "xyes"; then + echo "*** $be backend requires cURL library - $DISABLE_MSG" + backend_supported="no" + fi + if test "x${have_libxml}" != "xyes"; then + echo "*** $be backend requires XML library - $DISABLE_MSG" + backend_supported="no" + fi + # FIXME: Remove when PNG and/or PDF support have been added. + if test "x${sane_cv_use_libjpeg}" != "xyes"; then + echo "*** $be backend currently requires JPEG library - $DISABLE_MSG" + backend_supported="no" + fi + ;; + gphoto2) if test "${HAVE_GPHOTO2}" != "true" \ || test "${sane_cv_use_libjpeg}" != "yes"; then |