diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 013c032..7a86a0b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -48,6 +48,7 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then ANSI_FLAG= ;; esac + NORMAL_CFLAGS="${NORMAL_CFLAGS} ${ANSI_FLAG}" WARN_CFLAGS="${WARN_CFLAGS} ${ANSI_FLAG}" AC_ARG_ENABLE(warnings, @@ -312,6 +313,19 @@ AC_DEFUN([SANE_CHECK_TIFF], AC_SUBST(TIFF_LIBS) ]) +AC_DEFUN([SANE_CHECK_PNG], +[ + AC_CHECK_LIB(png,png_init_io, + [ + AC_CHECK_HEADER(png.h, + [sane_cv_use_libpng="yes"; PNG_LIBS="-lpng"],) + ],) + if test "$sane_cv_use_libpng" = "yes" ; then + AC_DEFINE(HAVE_LIBPNG,1,[Define to 1 if you have the libpng library.]) + fi + AC_SUBST(PNG_LIBS) +]) + # # Checks for pthread support AC_DEFUN([SANE_CHECK_LOCKING], @@ -592,14 +606,21 @@ for be in ${BACKENDS}; do mustek_pp) if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then - echo "*** $be backend requires libieee1284 and paraport-directio libraries - $DISABLE_MSG" + echo "*** $be backend requires libieee1284 or parport-directio libraries - $DISABLE_MSG" backend_supported="no" fi ;; dell1600n_net) if test "${sane_cv_use_libjpeg}" != "yes" || test "${sane_cv_use_libtiff}" != "yes"; then - echo "*** $be backend requires JPEG and/or TIFF library - $DISABLE_MSG" + echo "*** $be backend requires JPEG and TIFF library - $DISABLE_MSG" + backend_supported="no" + fi + ;; + + epsonds) + if test "${sane_cv_use_libjpeg}" != "yes"; then + echo "*** $be backend requires JPEG library - $DISABLE_MSG" backend_supported="no" fi ;; @@ -620,9 +641,9 @@ for be in ${BACKENDS}; do ;; qcam) - if test "${ac_cv_func_ioperm}" = "no" \ + if ( test "${ac_cv_func_ioperm}" = "no" || test "${sane_cv_have_sys_io_h_with_inb_outb}" = "no" )\ && test "${ac_cv_func__portaccess}" = "no"; then - echo "*** $be backend requires ioperm and portaccess functions - $DISABLE_MSG" + echo "*** $be backend requires (ioperm, inb and outb) or portaccess functions - $DISABLE_MSG" backend_supported="no" fi ;; |