kopia lustrzana https://gitlab.com/sane-project/backends
Sync derived files
This was done with AUTOMAKE="automake --add-missing --copy" autoreconf --force on Debian GNU/Linux 8.5.merge-requests/1/head
Olaf Meeuwissen
rodzic
17d78ab7c3
commit
d853463ef1
4
INSTALL
4
INSTALL
|
|
@ -12,8 +12,8 @@ without warranty of any kind.
|
|||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
Briefly, the shell command `./configure && make && make install'
|
||||
should configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package. Some packages provide this
|
||||
`INSTALL' file but do not implement all of the features documented
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
|
|||
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(top_srcdir)/include/sane/config.h.in mkinstalldirs \
|
||||
$(dist_doc_DATA) COPYING compile config.guess config.sub \
|
||||
depcomp install-sh missing ltmain.sh
|
||||
$(dist_doc_DATA) COPYING ar-lib compile config.guess \
|
||||
config.sub depcomp install-sh missing ltmain.sh
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
|
||||
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
|
||||
|
|
@ -288,7 +288,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -303,7 +302,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
@ -424,6 +422,7 @@ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1 ChangeLog-1.0.2 \
|
|||
# Keep the .cvsignore files sorted, and use this target to do it.
|
||||
#
|
||||
PERL = perl
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
|
|
|
|||
|
|
@ -271,6 +271,66 @@ m4_ifndef([AC_AUTOCONF_VERSION],
|
|||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||||
|
||||
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
||||
# AM_PROG_AR([ACT-IF-FAIL])
|
||||
# -------------------------
|
||||
# Try to determine the archiver interface, and trigger the ar-lib wrapper
|
||||
# if it is needed. If the detection of archiver interface fails, run
|
||||
# ACT-IF-FAIL (default is to abort configure with a proper error message).
|
||||
AC_DEFUN([AM_PROG_AR],
|
||||
[AC_BEFORE([$0], [LT_INIT])dnl
|
||||
AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
|
||||
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
||||
AC_REQUIRE_AUX_FILE([ar-lib])dnl
|
||||
AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
|
||||
: ${AR=ar}
|
||||
|
||||
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
|
||||
[AC_LANG_PUSH([C])
|
||||
am_cv_ar_interface=ar
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
|
||||
[am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
|
||||
AC_TRY_EVAL([am_ar_try])
|
||||
if test "$ac_status" -eq 0; then
|
||||
am_cv_ar_interface=ar
|
||||
else
|
||||
am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
|
||||
AC_TRY_EVAL([am_ar_try])
|
||||
if test "$ac_status" -eq 0; then
|
||||
am_cv_ar_interface=lib
|
||||
else
|
||||
am_cv_ar_interface=unknown
|
||||
fi
|
||||
fi
|
||||
rm -f conftest.lib libconftest.a
|
||||
])
|
||||
AC_LANG_POP([C])])
|
||||
|
||||
case $am_cv_ar_interface in
|
||||
ar)
|
||||
;;
|
||||
lib)
|
||||
# Microsoft lib, so override with the ar-lib wrapper script.
|
||||
# FIXME: It is wrong to rewrite AR.
|
||||
# But if we don't then we get into trouble of one sort or another.
|
||||
# A longer-term fix would be to have automake use am__AR in this case,
|
||||
# and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
|
||||
# similar.
|
||||
AR="$am_aux_dir/ar-lib $AR"
|
||||
;;
|
||||
unknown)
|
||||
m4_default([$1],
|
||||
[AC_MSG_ERROR([could not determine $AR interface])])
|
||||
;;
|
||||
esac
|
||||
AC_SUBST([AR])dnl
|
||||
])
|
||||
|
||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
|
|
|
|||
|
|
@ -1807,7 +1807,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -1822,7 +1821,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright 1992-2015 Free Software Foundation, Inc.
|
||||
# Copyright 1992-2014 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2015-09-14'
|
||||
timestamp='2014-03-23'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
|
@ -24,12 +24,12 @@ timestamp='2015-09-14'
|
|||
# program. This Exception is an additional permission under section 7
|
||||
# of the GNU General Public License, version 3 ("GPLv3").
|
||||
#
|
||||
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
|
||||
# Originally written by Per Bothner.
|
||||
#
|
||||
# You can get the latest version of this script from:
|
||||
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||
#
|
||||
# Please send patches to <config-patches@gnu.org>.
|
||||
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
|
||||
|
||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||
|
|
@ -50,7 +50,7 @@ version="\
|
|||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
Copyright 1992-2015 Free Software Foundation, Inc.
|
||||
Copyright 1992-2014 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
|
@ -168,27 +168,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
# Note: NetBSD doesn't particularly care about the vendor
|
||||
# portion of the name. We always set it to "unknown".
|
||||
sysctl="sysctl -n hw.machine_arch"
|
||||
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
|
||||
/sbin/$sysctl 2>/dev/null || \
|
||||
/usr/sbin/$sysctl 2>/dev/null || \
|
||||
echo unknown)`
|
||||
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
|
||||
/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
|
||||
case "${UNAME_MACHINE_ARCH}" in
|
||||
armeb) machine=armeb-unknown ;;
|
||||
arm*) machine=arm-unknown ;;
|
||||
sh3el) machine=shl-unknown ;;
|
||||
sh3eb) machine=sh-unknown ;;
|
||||
sh5el) machine=sh5le-unknown ;;
|
||||
earmv*)
|
||||
arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
|
||||
endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
|
||||
machine=${arch}${endian}-unknown
|
||||
;;
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
# to ELF recently, or will in the future.
|
||||
case "${UNAME_MACHINE_ARCH}" in
|
||||
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||
eval $set_cc_for_build
|
||||
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ELF__
|
||||
|
|
@ -204,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
os=netbsd
|
||||
;;
|
||||
esac
|
||||
# Determine ABI tags.
|
||||
case "${UNAME_MACHINE_ARCH}" in
|
||||
earm*)
|
||||
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
|
||||
abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
|
||||
;;
|
||||
esac
|
||||
# The OS release
|
||||
# Debian GNU/NetBSD machines have a different userland, and
|
||||
# thus, need a distinct triplet. However, they do not need
|
||||
|
|
@ -221,13 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
release='-gnu'
|
||||
;;
|
||||
*)
|
||||
release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
|
||||
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
;;
|
||||
esac
|
||||
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
|
||||
# contains redundant information, the shorter form:
|
||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
||||
echo "${machine}-${os}${release}${abi}"
|
||||
echo "${machine}-${os}${release}"
|
||||
exit ;;
|
||||
*:Bitrig:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
|
||||
|
|
@ -249,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
*:MirBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:Sortix:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-sortix
|
||||
exit ;;
|
||||
alpha:OSF1:*:*)
|
||||
case $UNAME_RELEASE in
|
||||
*4.0)
|
||||
|
|
@ -596,9 +579,8 @@ EOF
|
|||
else
|
||||
IBM_ARCH=powerpc
|
||||
fi
|
||||
if [ -x /usr/bin/lslpp ] ; then
|
||||
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
|
||||
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
|
||||
if [ -x /usr/bin/oslevel ] ; then
|
||||
IBM_REV=`/usr/bin/oslevel`
|
||||
else
|
||||
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
|
||||
fi
|
||||
|
|
@ -950,9 +932,6 @@ EOF
|
|||
crisv32:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
e2k:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
|
|
@ -965,9 +944,6 @@ EOF
|
|||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
k1om:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
|
|
@ -1044,7 +1020,7 @@ EOF
|
|||
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright 1992-2015 Free Software Foundation, Inc.
|
||||
# Copyright 1992-2014 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2015-08-20'
|
||||
timestamp='2014-09-11'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
|
@ -25,7 +25,7 @@ timestamp='2015-08-20'
|
|||
# of the GNU General Public License, version 3 ("GPLv3").
|
||||
|
||||
|
||||
# Please send patches to <config-patches@gnu.org>.
|
||||
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
#
|
||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||
# Supply the specified configuration type as an argument.
|
||||
|
|
@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
|
|||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright 1992-2015 Free Software Foundation, Inc.
|
||||
Copyright 1992-2014 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
|
@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
|
||||
knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
kopensolaris*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
|
|
@ -255,13 +255,12 @@ case $basic_machine in
|
|||
| arc | arceb \
|
||||
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
||||
| avr | avr32 \
|
||||
| ba \
|
||||
| be32 | be64 \
|
||||
| bfin \
|
||||
| c4x | c8051 | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| e2k | epiphany \
|
||||
| fido | fr30 | frv | ft32 \
|
||||
| epiphany \
|
||||
| fido | fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| hexagon \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
|
|
@ -306,7 +305,7 @@ case $basic_machine in
|
|||
| riscv32 | riscv64 \
|
||||
| rl78 | rx \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
|
|
@ -314,7 +313,6 @@ case $basic_machine in
|
|||
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
|
||||
| ubicom32 \
|
||||
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
||||
| visium \
|
||||
| we32k \
|
||||
| x86 | xc16x | xstormy16 | xtensa \
|
||||
| z8k | z80)
|
||||
|
|
@ -329,9 +327,6 @@ case $basic_machine in
|
|||
c6x)
|
||||
basic_machine=tic6x-unknown
|
||||
;;
|
||||
leon|leon[3-9])
|
||||
basic_machine=sparc-$basic_machine
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
|
|
@ -377,13 +372,12 @@ case $basic_machine in
|
|||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* | avr32-* \
|
||||
| ba-* \
|
||||
| be32-* | be64-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* \
|
||||
| c8051-* | clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| e2k-* | elxsi-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
|
|
@ -430,13 +424,12 @@ case $basic_machine in
|
|||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
|
||||
| pyramid-* \
|
||||
| riscv32-* | riscv64-* \
|
||||
| rl78-* | romp-* | rs6000-* | rx-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
|
||||
| tahoe-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tile*-* \
|
||||
|
|
@ -444,7 +437,6 @@ case $basic_machine in
|
|||
| ubicom32-* \
|
||||
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
|
||||
| vax-* \
|
||||
| visium-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* \
|
||||
| xstormy16-* | xtensa*-* \
|
||||
|
|
@ -521,9 +513,6 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
os=-aros
|
||||
;;
|
||||
asmjs)
|
||||
basic_machine=asmjs-unknown
|
||||
;;
|
||||
aux)
|
||||
basic_machine=m68k-apple
|
||||
os=-aux
|
||||
|
|
@ -785,9 +774,6 @@ case $basic_machine in
|
|||
basic_machine=m68k-isi
|
||||
os=-sysv
|
||||
;;
|
||||
leon-*|leon[3-9]-*)
|
||||
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
|
||||
;;
|
||||
m68knommu)
|
||||
basic_machine=m68k-unknown
|
||||
os=-linux
|
||||
|
|
@ -1379,7 +1365,7 @@ case $os in
|
|||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||
| -sym* | -kopensolaris* | -plan9* \
|
||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||
| -aos* | -aros* | -cloudabi* | -sortix* \
|
||||
| -aos* | -aros* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -215,7 +215,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -230,7 +229,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
@ -827,7 +825,9 @@ dvi: dvi-am
|
|||
|
||||
dvi-am:
|
||||
|
||||
html-am:
|
||||
html: html-am
|
||||
|
||||
html-am: html-local
|
||||
|
||||
info: info-am
|
||||
|
||||
|
|
@ -888,14 +888,15 @@ uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
|
|||
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
|
||||
clean-local cscopelist-am ctags-am distclean distclean-generic \
|
||||
distclean-libtool distclean-local distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-data-local install-dist_docDATA \
|
||||
install-docDATA install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-html install-html-am install-info \
|
||||
install-info-am install-man install-man1 install-man7 \
|
||||
install-man8 install-nobase_dist_docDATA install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
html-am html-local info info-am install install-am \
|
||||
install-data install-data-am install-data-local \
|
||||
install-dist_docDATA install-docDATA install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-man1 install-man7 install-man8 \
|
||||
install-nobase_dist_docDATA install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
|
||||
uninstall-am uninstall-dist_docDATA uninstall-docDATA \
|
||||
|
|
@ -994,7 +995,7 @@ descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
|
|||
> descriptions-external.db
|
||||
|
||||
html-pages: $(HTML_PAGES)
|
||||
html: html-pages html-man sane-html
|
||||
html-local: html-pages html-man sane-html
|
||||
|
||||
clean-local:
|
||||
rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -265,7 +264,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -224,7 +224,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -239,7 +238,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@
|
|||
*/
|
||||
#undef LT_OBJDIR
|
||||
|
||||
/* Define to the name of the distribution. */
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
|
|
@ -541,7 +541,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
/* Define to the version of the distribution. */
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* define if Avahi support is enabled for saned and the net backend */
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ am__can_run_installinfo = \
|
|||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
JAVAC = javac
|
||||
CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"}
|
||||
am__java_sources = $(dist_noinst_JAVA)
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
|
|
@ -210,7 +211,7 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
|
|||
-I${JDK_HOME}/include/genunix
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS) -version-number \
|
||||
$(V_MAJOR):$(V_MINOR):$(VREV)
|
||||
$(V_MAJOR):$(V_MINOR):$(V_REV)
|
||||
AR = @AR@
|
||||
AS = @AS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
|
@ -267,7 +268,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -282,7 +282,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
@ -382,8 +381,8 @@ top_build_prefix = @top_build_prefix@
|
|||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
JAVAROOT = .
|
||||
CLASSPATH_ENV = .
|
||||
JAVAH = javah -jni -cp $(CLASSPATH_ENV)
|
||||
MY_CLASSPATH = .
|
||||
JAVAH = javah -jni -cp $(MY_CLASSPATH)
|
||||
JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
|
||||
Sane.java SaneParameters.java ScanIt.java \
|
||||
ImageCanvas.java ImageCanvasClient.java \
|
||||
|
|
@ -391,7 +390,7 @@ JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
|
|||
|
||||
dist_noinst_JAVA = $(JAVA_SRC)
|
||||
LIBSANE = ../backend/libsane.la
|
||||
EXTRA_DIST = Makefile.in README.JAVA
|
||||
EXTRA_DIST = README.JAVA
|
||||
lib_LTLIBRARIES = libsanej.la
|
||||
BUILT_SOURCES = Sane.h
|
||||
CLEANFILES = Sane.h
|
||||
|
|
|
|||
|
|
@ -232,7 +232,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -247,7 +246,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
4
missing
4
missing
|
|
@ -1,7 +1,7 @@
|
|||
#! /bin/sh
|
||||
# Common wrapper for a few potentially missing GNU programs.
|
||||
|
||||
scriptversion=2012-06-26.16; # UTC
|
||||
scriptversion=2013-10-28.13; # UTC
|
||||
|
||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
||||
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
|
@ -160,7 +160,7 @@ give_advice ()
|
|||
;;
|
||||
autom4te*)
|
||||
echo "You might have modified some maintainer files that require"
|
||||
echo "the 'automa4te' program to be rebuilt."
|
||||
echo "the 'autom4te' program to be rebuilt."
|
||||
program_details 'autom4te'
|
||||
;;
|
||||
bison*|yacc*)
|
||||
|
|
|
|||
|
|
@ -179,7 +179,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -194,7 +193,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -241,7 +241,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -256,7 +255,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
20
test-driver
20
test-driver
|
|
@ -1,7 +1,7 @@
|
|||
#! /bin/sh
|
||||
# test-driver - basic testsuite driver script.
|
||||
|
||||
scriptversion=2012-06-27.10; # UTC
|
||||
scriptversion=2013-07-13.22; # UTC
|
||||
|
||||
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
@ -44,13 +44,12 @@ print_usage ()
|
|||
Usage:
|
||||
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
|
||||
[--expect-failure={yes|no}] [--color-tests={yes|no}]
|
||||
[--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
|
||||
[--enable-hard-errors={yes|no}] [--]
|
||||
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
|
||||
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
|
||||
END
|
||||
}
|
||||
|
||||
# TODO: better error handling in option parsing (in particular, ensure
|
||||
# TODO: $log_file, $trs_file and $test_name are defined).
|
||||
test_name= # Used for reporting.
|
||||
log_file= # Where to save the output of the test script.
|
||||
trs_file= # Where to save the metadata of the test run.
|
||||
|
|
@ -69,10 +68,23 @@ while test $# -gt 0; do
|
|||
--enable-hard-errors) enable_hard_errors=$2; shift;;
|
||||
--) shift; break;;
|
||||
-*) usage_error "invalid option: '$1'";;
|
||||
*) break;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
missing_opts=
|
||||
test x"$test_name" = x && missing_opts="$missing_opts --test-name"
|
||||
test x"$log_file" = x && missing_opts="$missing_opts --log-file"
|
||||
test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
|
||||
if test x"$missing_opts" != x; then
|
||||
usage_error "the following mandatory options are missing:$missing_opts"
|
||||
fi
|
||||
|
||||
if test $# -eq 0; then
|
||||
usage_error "missing argument"
|
||||
fi
|
||||
|
||||
if test $color_tests = yes; then
|
||||
# Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
|
||||
red='[0;31m' # Red.
|
||||
|
|
|
|||
|
|
@ -236,7 +236,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -251,7 +250,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -453,7 +453,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -468,7 +467,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -176,7 +176,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -191,7 +190,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
|
|
@ -285,7 +285,6 @@ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
|
|||
LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
|
||||
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
|
||||
LIBV4L_LIBS = @LIBV4L_LIBS@
|
||||
LINKER_RPATH = @LINKER_RPATH@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LOCKPATH_GROUP = @LOCKPATH_GROUP@
|
||||
|
|
@ -300,7 +299,6 @@ MSGFMT = @MSGFMT@
|
|||
MSGMERGE = @MSGMERGE@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue