kopia lustrzana https://gitlab.com/sane-project/backends
Remove checks for specific version numbers of gphoto2 - that's not
good for long term maintenance, and the API has settled down enough that all recent versions (both releases and CVS) are workable for SANE. It is still necessary to specify --with-gphoto2 if you want to use the gphoto2 backend.DEVEL_2_0_BRANCH-1
Peter Fales
rodzic
ba484e4b21
commit
bcfa90dd98
25
acinclude.m4
25
acinclude.m4
|
|
@ -222,30 +222,17 @@ AC_DEFUN(SANE_CHECK_GPHOTO2,
|
|||
else
|
||||
AC_CHECK_TOOL(HAVE_GPHOTO2, gphoto2-config, false)
|
||||
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
GPVERSION=`gphoto2-config --version`
|
||||
if test $HAVE_GPHOTO2 != ""
|
||||
then
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
|
||||
case "$GPVERSION" in
|
||||
"gphoto2 2.0" | \
|
||||
"gphoto2 2.1.0" | \
|
||||
"gphoto2 2.0.1"* \
|
||||
)
|
||||
CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
|
||||
GPHOTO2_LIBS="`gphoto2-config --libs`"
|
||||
SANE_EXTRACT_LDFLAGS(LDFLAGS, GPHOTO2_LIBS)
|
||||
LIBS="${LIBS} ${GPHOTO2_LIBS}"
|
||||
;;
|
||||
* )
|
||||
echo
|
||||
echo "Sorry, can't use GPHOTO2"
|
||||
echo "GPHOTO2 APIs have been changing rapidly. Only"
|
||||
echo "the current version from CVS is likely to work."
|
||||
echo
|
||||
HAVE_GPHOTO2=""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
]) fi
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -234,30 +234,17 @@ AC_DEFUN(SANE_CHECK_GPHOTO2,
|
|||
else
|
||||
AC_CHECK_TOOL(HAVE_GPHOTO2, gphoto2-config, false)
|
||||
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
GPVERSION=`gphoto2-config --version`
|
||||
if test $HAVE_GPHOTO2 != ""
|
||||
then
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
|
||||
case "$GPVERSION" in
|
||||
"gphoto2 2.0" | \
|
||||
"gphoto2 2.1.0" | \
|
||||
"gphoto2 2.0.1"* \
|
||||
)
|
||||
CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
|
||||
GPHOTO2_LIBS="`gphoto2-config --libs`"
|
||||
SANE_EXTRACT_LDFLAGS(LDFLAGS, GPHOTO2_LIBS)
|
||||
LIBS="${LIBS} ${GPHOTO2_LIBS}"
|
||||
;;
|
||||
* )
|
||||
echo
|
||||
echo "Sorry, can't use GPHOTO2"
|
||||
echo "GPHOTO2 APIs have been changing rapidly. Only"
|
||||
echo "the current version from CVS is likely to work."
|
||||
echo
|
||||
HAVE_GPHOTO2=""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
]) fi
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -3503,16 +3503,12 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
GPVERSION=`gphoto2-config --version`
|
||||
if test $HAVE_GPHOTO2 != ""
|
||||
then
|
||||
if test "$with_gphoto2" = "yes" ; then
|
||||
with_gphoto2=`gphoto2-config --prefix`
|
||||
fi
|
||||
|
||||
case "$GPVERSION" in
|
||||
"gphoto2 2.0" | \
|
||||
"gphoto2 2.1.0" | \
|
||||
"gphoto2 2.0.1"* \
|
||||
)
|
||||
CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
|
||||
GPHOTO2_LIBS="`gphoto2-config --libs`"
|
||||
tmp_LIBS=""
|
||||
|
|
@ -3531,16 +3527,7 @@ unset tmp_LIBS
|
|||
unset param
|
||||
|
||||
LIBS="${LIBS} ${GPHOTO2_LIBS}"
|
||||
;;
|
||||
* )
|
||||
echo
|
||||
echo "Sorry, can't use GPHOTO2"
|
||||
echo "GPHOTO2 APIs have been changing rapidly. Only"
|
||||
echo "the current version from CVS is likely to work."
|
||||
echo
|
||||
HAVE_GPHOTO2=""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
|
|
@ -3548,7 +3535,7 @@ fi
|
|||
|
||||
if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then
|
||||
echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:3552: checking for gethostbyaddr in -lnsl" >&5
|
||||
echo "configure:3539: checking for gethostbyaddr in -lnsl" >&5
|
||||
ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3556,7 +3543,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3560 "configure"
|
||||
#line 3547 "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
|
||||
|
|
@ -3567,7 +3554,7 @@ int main() {
|
|||
gethostbyaddr()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3558: \"$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
|
||||
|
|
@ -3595,7 +3582,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:3599: checking for socket in -lsocket" >&5
|
||||
echo "configure:3586: checking for socket in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3603,7 +3590,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3607 "configure"
|
||||
#line 3594 "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
|
||||
|
|
@ -3614,7 +3601,7 @@ int main() {
|
|||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3605: \"$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
|
||||
|
|
@ -3642,7 +3629,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for syslog in -lsyslog""... $ac_c" 1>&6
|
||||
echo "configure:3646: checking for syslog in -lsyslog" >&5
|
||||
echo "configure:3633: checking for syslog in -lsyslog" >&5
|
||||
ac_lib_var=`echo syslog'_'syslog | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3650,7 +3637,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsyslog $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3654 "configure"
|
||||
#line 3641 "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
|
||||
|
|
@ -3661,7 +3648,7 @@ int main() {
|
|||
syslog()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3652: \"$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
|
||||
|
|
@ -3701,19 +3688,19 @@ fi
|
|||
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
||||
# for constant arguments. Useless!
|
||||
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
|
||||
echo "configure:3705: checking for working alloca.h" >&5
|
||||
echo "configure:3692: checking for working alloca.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3710 "configure"
|
||||
#line 3697 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_alloca_h=yes
|
||||
else
|
||||
|
|
@ -3734,12 +3721,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:3738: checking for alloca" >&5
|
||||
echo "configure:3725: checking for alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3743 "configure"
|
||||
#line 3730 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -3767,7 +3754,7 @@ int main() {
|
|||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_alloca_works=yes
|
||||
else
|
||||
|
|
@ -3799,12 +3786,12 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:3803: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:3790: checking whether alloca needs Cray hooks" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3808 "configure"
|
||||
#line 3795 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
|
|
@ -3829,12 +3816,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
|
|||
if test $ac_cv_os_cray = yes; then
|
||||
for ac_func in _getb67 GETB67 getb67; do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3833: checking for $ac_func" >&5
|
||||
echo "configure:3820: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3838 "configure"
|
||||
#line 3825 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -3857,7 +3844,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -3884,7 +3871,7 @@ done
|
|||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:3888: checking stack direction for C alloca" >&5
|
||||
echo "configure:3875: checking stack direction for C alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3892,7 +3879,7 @@ else
|
|||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3896 "configure"
|
||||
#line 3883 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
|
|
@ -3911,7 +3898,7 @@ main ()
|
|||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_stack_direction=1
|
||||
else
|
||||
|
|
@ -3932,21 +3919,21 @@ EOF
|
|||
|
||||
fi
|
||||
|
||||
for ac_hdr in unistd.h
|
||||
for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:3940: checking for $ac_hdr" >&5
|
||||
echo "configure:3927: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3945 "configure"
|
||||
#line 3932 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3975,12 +3962,12 @@ done
|
|||
for ac_func in getpagesize
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3979: checking for $ac_func" >&5
|
||||
echo "configure:3966: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3984 "configure"
|
||||
#line 3971 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -4003,7 +3990,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -4028,7 +4015,7 @@ fi
|
|||
done
|
||||
|
||||
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
|
||||
echo "configure:4032: checking for working mmap" >&5
|
||||
echo "configure:4019: checking for working mmap" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4036,7 +4023,7 @@ else
|
|||
ac_cv_func_mmap_fixed_mapped=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4040 "configure"
|
||||
#line 4027 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Thanks to Mike Haertel and Jim Avera for this test.
|
||||
|
|
@ -4064,11 +4051,24 @@ else
|
|||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#if HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_SYS_STAT_H
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
/* This mess was copied from the GNU getpagesize.h. */
|
||||
#ifndef HAVE_GETPAGESIZE
|
||||
# ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
# endif
|
||||
|
||||
/* Assume that all systems that can run configure have sys/param.h. */
|
||||
# ifndef HAVE_SYS_PARAM_H
|
||||
|
|
@ -4767,7 +4767,7 @@ else
|
|||
if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.$ac_ext | *.c | *.o | *.obj) ;;
|
||||
*.c | *.o | *.obj) ;;
|
||||
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
|
||||
esac
|
||||
done
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue