kopia lustrzana https://gitlab.com/sane-project/backends
configure, configure.in, include/sanei.h: bumped version
number to 1.1.0 and enabled 1.1 frame types.merge-requests/1/head
Alessandro Zummo
rodzic
3c9f28e17d
commit
bd8ece51d8
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for sane-backends 1.0.19-cvs.
|
||||
# Generated by GNU Autoconf 2.61 for sane-backends 1.1.0-cvs.
|
||||
#
|
||||
# Report bugs to <sane-devel@lists.alioth.debian.org>.
|
||||
#
|
||||
|
|
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='sane-backends'
|
||||
PACKAGE_TARNAME='sane-backends'
|
||||
PACKAGE_VERSION='1.0.19-cvs'
|
||||
PACKAGE_STRING='sane-backends 1.0.19-cvs'
|
||||
PACKAGE_VERSION='1.1.0-cvs'
|
||||
PACKAGE_STRING='sane-backends 1.1.0-cvs'
|
||||
PACKAGE_BUGREPORT='sane-devel@lists.alioth.debian.org'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
|
|
@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures sane-backends 1.0.19-cvs to adapt to many kinds of systems.
|
||||
\`configure' configures sane-backends 1.1.0-cvs to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1472,7 +1472,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of sane-backends 1.0.19-cvs:";;
|
||||
short | recursive ) echo "Configuration of sane-backends 1.1.0-cvs:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1596,7 +1596,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
sane-backends configure 1.0.19-cvs
|
||||
sane-backends configure 1.1.0-cvs
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
|
|
@ -1610,7 +1610,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by sane-backends $as_me 1.0.19-cvs, which was
|
||||
It was created by sane-backends $as_me 1.1.0-cvs, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -1964,8 +1964,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
V_MAJOR=1
|
||||
V_MINOR=0
|
||||
V_REV=19
|
||||
V_MINOR=1
|
||||
V_REV=0
|
||||
is_release=no
|
||||
|
||||
ac_config_headers="$ac_config_headers include/sane/config.h"
|
||||
|
|
@ -1985,7 +1985,7 @@ rm -f conftest.sed
|
|||
|
||||
|
||||
PACKAGE=sane-backends
|
||||
VERSION=1.0.19-cvs
|
||||
VERSION=1.1.0-cvs
|
||||
NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -27045,7 +27045,7 @@ else
|
|||
echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
|
||||
else
|
||||
BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e avision bh \
|
||||
canon canon630u cardscan coolscan coolscan2 dc25 dmc \
|
||||
canon canon630u cardscan coolscan coolscan2 coolscan3 dc25 dmc \
|
||||
epjitsu epson epson2 fujitsu genesys gt68xx \
|
||||
hp hp3500 hp3900 hp4200 hp5400 hp5590 hpljm1005 hs2p \
|
||||
ibm leo lexmark \
|
||||
|
|
@ -27644,7 +27644,7 @@ exec 6>&1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by sane-backends $as_me 1.0.19-cvs, which was
|
||||
This file was extended by sane-backends $as_me 1.1.0-cvs, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -27693,7 +27693,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
sane-backends config.status 1.0.19-cvs
|
||||
sane-backends config.status 1.1.0-cvs
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
|
|||
dnl ***********************************************************************
|
||||
dnl When preparing a release, increase the numeric and string version numbers,
|
||||
dnl remove the "-cvs" suffix, and set is_release=yes
|
||||
AC_INIT([sane-backends],[1.0.19-cvs],[sane-devel@lists.alioth.debian.org])
|
||||
AC_INIT([sane-backends],[1.1.0-cvs],[sane-devel@lists.alioth.debian.org])
|
||||
V_MAJOR=1
|
||||
V_MINOR=0
|
||||
V_REV=19
|
||||
V_MINOR=1
|
||||
V_REV=0
|
||||
is_release=no
|
||||
dnl ***********************************************************************
|
||||
|
||||
|
|
@ -361,7 +361,7 @@ else
|
|||
AC_MSG_NOTICE([Manually selected backends: ${BACKENDS}])
|
||||
else
|
||||
BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e avision bh \
|
||||
canon canon630u cardscan coolscan coolscan2 dc25 dmc \
|
||||
canon canon630u cardscan coolscan coolscan2 coolscan3 dc25 dmc \
|
||||
epjitsu epson epson2 fujitsu genesys gt68xx \
|
||||
hp hp3500 hp3900 hp4200 hp5400 hp5590 hpljm1005 hs2p \
|
||||
ibm leo lexmark \
|
||||
|
|
|
|||
|
|
@ -168,24 +168,24 @@ typedef enum
|
|||
SANE_FRAME_GRAY, /* band covering human visual range */
|
||||
SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */
|
||||
SANE_FRAME_RED, /* red band only */
|
||||
SANE_FRAME_GREEN, /* green band only */
|
||||
SANE_FRAME_BLUE /* blue band only */
|
||||
SANE_FRAME_GREEN, /* green band only */
|
||||
SANE_FRAME_BLUE, /* blue band only */
|
||||
|
||||
/* push remaining types down to match existing backends */
|
||||
/* these frame types should not be used by default, */
|
||||
/* as most front-ends will not understand them */
|
||||
/* these will be enabled in SANE 1.1.0 */
|
||||
#if 0
|
||||
SANE_FRAME_TEXT=10, /* for various textual/xml data */
|
||||
SANE_FRAME_JPEG, /* complete baseline JPEG file */
|
||||
SANE_FRAME_G31D, /* CCITT Group 3 1-D Compressed file */
|
||||
SANE_FRAME_G32D, /* CCITT Group 3 2-D Compressed file */
|
||||
SANE_FRAME_G42D, /* CCITT Group 4 2-D Compressed file */
|
||||
|
||||
SANE_FRAME_IR /* bare infrared channel */
|
||||
SANE_FRAME_RGBI, /* red+green+blue+infrared */
|
||||
SANE_FRAME_GRAYI /* gray+infrared */
|
||||
#endif
|
||||
SANE_FRAME_TEXT = 0x0A, /* for various textual/xml data */
|
||||
SANE_FRAME_JPEG, /* complete baseline JPEG file */
|
||||
SANE_FRAME_G31D, /* CCITT Group 3 1-D Compressed file */
|
||||
SANE_FRAME_G32D, /* CCITT Group 3 2-D Compressed file */
|
||||
SANE_FRAME_G42D, /* CCITT Group 4 2-D Compressed file */
|
||||
|
||||
SANE_FRAME_IR, /* bare infrared channel */
|
||||
SANE_FRAME_RGBI, /* red+green+blue+infrared */
|
||||
SANE_FRAME_GRAYI /* gray+infrared */
|
||||
|
||||
}
|
||||
SANE_Frame;
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue