added dell1600n_net to the build

removed #include <sys/select.h>
merge-requests/1/head
Jon Chambers 2006-05-24 20:56:15 +00:00
rodzic 8654dbb07f
commit b584612aae
6 zmienionych plików z 4501 dodań i 3666 usunięć

Wyświetl plik

@ -255,8 +255,8 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
])
#
# Checks for jpeg library >= v6B (61), needed for DC210, DC240, and
# GPHOTO2 backends.
# Checks for jpeg library >= v6B (61), needed for DC210, DC240,
# GPHOTO2 and dell1600n_net backends.
AC_DEFUN([SANE_CHECK_JPEG],
[
AC_CHECK_LIB(jpeg,jpeg_start_decompress,
@ -276,6 +276,16 @@ AC_DEFUN([SANE_CHECK_JPEG],
],)
])
# Checks for tiff library dell1600n_net backend.
AC_DEFUN([SANE_CHECK_TIFF],
[
AC_CHECK_LIB(tiff,TIFFFdOpen,
[
AC_CHECK_HEADER(tiffio.h,
[sane_cv_use_libtiff="yes"; LIBS="${LIBS} -ltiff"],)
],)
])
#
# Checks for pthread support
AC_DEFUN([SANE_CHECK_LOCKING],

Wyświetl plik

@ -95,7 +95,7 @@ DISTFILES = abaton.c abaton.conf.in abaton.h agfafocus.c agfafocus.conf.in \
canon_pp-dev.h canon_pp-io.c canon_pp-io.h coolscan.c \
coolscan.conf.in coolscan.h coolscan-scsidef.h coolscan2.c coolscan2.conf.in \
dc210.c dc210.conf.in dc210.h \
dc240.c dc240.conf.in dc240.h dc25.c dc25.conf.in dc25.h \
dc240.c dc240.conf.in dc240.h dc25.c dc25.conf.in dc25.h dell1600n_net.c\
dll.aliases dll.c dll.conf.in dmc.c dmc.conf.in dmc.h \
epson.c epson_scsi.c epson_usb.c epson.conf.in epson.h epson_scsi.h \
epson_usb.h \

Wyświetl plik

@ -71,7 +71,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/select.h>
#include <netdb.h>
#include <jpeglib.h>

Wyświetl plik

@ -16,6 +16,7 @@ coolscan2
#dc25
#dc210
#dc240
dell1600n_net
dmc
epson
fujitsu

8141
configure vendored

Plik diff jest za duży Load Diff

Wyświetl plik

@ -104,6 +104,7 @@ if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then
AC_SEARCH_LIBS(syslog, syslog be) # OS/2 needs -lsyslog, BeOS needs -lbe
fi
SANE_CHECK_JPEG
SANE_CHECK_TIFF
SANE_CHECK_IEEE1284
SANE_CHECK_PTHREAD
SANE_CHECK_LOCKING
@ -370,6 +371,13 @@ else
BACKENDS="${BACKENDS} mustek_pp"
fi
if test "${sane_cv_use_libjpeg}" != "yes" || test "${sane_cv_use_libtiff}" != "yes"
then
echo "*** disabling DELL1600N_NET backend (failed to find jpeg and/or tiff library"
else
BACKENDS="${BACKENDS} dell1600n_net"
fi
if test "${HAVE_GPHOTO2}" != "true" \
-o "${sane_cv_use_libjpeg}" != "yes"; then
echo "*** disabling GPHOTO2 backend (not requested, or failed to find required libraries)"