kopia lustrzana https://gitlab.com/sane-project/backends
Check for sys/sem.h and disable snapscan if it isn't available.
Removed "//" (C++-style comment) from config.h.in. Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
rodzic
e8b5fc930f
commit
b77a094ee7
|
@ -1642,7 +1642,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
|
||||
sys/sem.h
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
@ -4318,6 +4318,14 @@ else
|
|||
SM3600=sm3600
|
||||
fi
|
||||
|
||||
if test "${ac_cv_header_sys_sem_h}" = "no" ; then
|
||||
echo "disabling SnapScan backend"
|
||||
SNAPSCAN=
|
||||
else
|
||||
echo "enabling SnapScan backend"
|
||||
SNAPSCAN=snapscan
|
||||
fi
|
||||
|
||||
|
||||
if test "${enable_shared}" = "no"; then
|
||||
enable_preload=yes
|
||||
|
@ -4367,7 +4375,7 @@ fi
|
|||
# Extract the first word of "sane-config", so it can be a program name with args.
|
||||
set dummy sane-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4371: checking for $ac_word" >&5
|
||||
echo "configure:4379: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG_PATH'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
@ -4401,7 +4409,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for sane_init in -lsane""... $ac_c" 1>&6
|
||||
echo "configure:4405: checking for sane_init in -lsane" >&5
|
||||
echo "configure:4413: checking for sane_init in -lsane" >&5
|
||||
ac_lib_var=`echo sane'_'sane_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -4409,7 +4417,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsane $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4413 "configure"
|
||||
#line 4421 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
@ -4420,7 +4428,7 @@ int main() {
|
|||
sane_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
@ -4621,6 +4629,7 @@ s%@V4L@%$V4L%g
|
|||
s%@NET@%$NET%g
|
||||
s%@SANED@%$SANED%g
|
||||
s%@SM3600@%$SM3600%g
|
||||
s%@SNAPSCAN@%$SNAPSCAN%g
|
||||
s%@PNM@%$PNM%g
|
||||
s%@SANE_CONFIG_PATH@%$SANE_CONFIG_PATH%g
|
||||
s%@V_MAJOR@%$V_MAJOR%g
|
||||
|
|
10
configure.in
10
configure.in
|
@ -104,7 +104,7 @@ AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
|
|||
camlib.h os2.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
|
||||
sys/types.h sys/scsi/scsi.h sys/scsi/sgdefs.h sys/scsi/targets/scgio.h \
|
||||
apollo/scsi.h sys/sdi_comm.h sys/passthrudef.h linux/ppdev.h usb.h \
|
||||
sys/bitypes.h)
|
||||
sys/bitypes.h, sys/sem.h)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
|
@ -262,6 +262,14 @@ else
|
|||
SM3600=sm3600
|
||||
fi
|
||||
AC_SUBST(SM3600)
|
||||
if test "${ac_cv_header_sys_sem_h}" = "no" ; then
|
||||
echo "disabling SnapScan backend"
|
||||
SNAPSCAN=
|
||||
else
|
||||
echo "enabling SnapScan backend"
|
||||
SNAPSCAN=snapscan
|
||||
fi
|
||||
AC_SUBST(SNAPSCAN)
|
||||
|
||||
if test "${enable_shared}" = "no"; then
|
||||
enable_preload=yes
|
||||
|
|
Ładowanie…
Reference in New Issue