kopia lustrzana https://gitlab.com/sane-project/backends
Cross compilation fixes and libtool update
Mattias Ellert
rodzic
6e67a84696
commit
93e856b53f
18
ChangeLog
18
ChangeLog
|
|
@ -1,3 +1,21 @@
|
|||
2007-05-08 Mattias Ellert <mattias.ellert@tsl.uu.se>
|
||||
|
||||
* acinclude.m4: NSLinkModule is deprecated in favour of dlopen -
|
||||
only look for NSLinkModule if dlopen is not available
|
||||
* acinclude.m4, m4/libtool.m4: include libtool.m4 using m4_include
|
||||
* ltmain.sh, m4/libtool.m4: newer versions.
|
||||
* configure.in: move the byteorder test to after AC_GNU_SOURCE et al.
|
||||
to avoid warnings when running autoconf,
|
||||
add AC_SUBST(CROSS_COMPILING),
|
||||
add a check for IOKit/scsi/SCSICommandOperationCodes.h
|
||||
* doc/Makefile.in, tools/Makefile.in: disable things that need the
|
||||
built binaries to run when doing cross-compilations
|
||||
* sanei/sanei_scsi.c: IOKit/scsi-commands has moved to IOKit/scsi -
|
||||
support both locations of headers
|
||||
* aclocal.m4, config.guess, config.sub, configure, sane/config.h.in:
|
||||
update autogenerated files
|
||||
* sane-backends/Makefile.in: remove sanei_config2 from cardscan deps
|
||||
|
||||
2007-11-08 Gerhard Jaeger <gerhard@gjaeger.de>
|
||||
|
||||
* doc/plustek/Plustek-USB.changes doc/sane-plustek.man: Update
|
||||
|
|
|
|||
6185
acinclude.m4
6185
acinclude.m4
Plik diff jest za duży
Load Diff
|
|
@ -1,7 +1,7 @@
|
|||
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.10 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||
# 2005 Free Software Foundation, Inc.
|
||||
# 2005, 2006 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.
|
||||
|
|
|
|||
|
|
@ -358,7 +358,6 @@ libsane-canon.la: ../sanei/sanei_scsi.lo
|
|||
libsane-canon630u.la: ../sanei/sanei_constrain_value.lo
|
||||
libsane-canon630u.la: ../sanei/sanei_usb.lo
|
||||
libsane-canon_pp.la: $(addsuffix .lo,$(EXTRA_canon_pp))
|
||||
libsane-cardscan.la: ../sanei/sanei_config2.lo
|
||||
libsane-cardscan.la: ../sanei/sanei_constrain_value.lo
|
||||
libsane-cardscan.la: ../sanei/sanei_usb.lo
|
||||
libsane-coolscan.la: ../sanei/sanei_config2.lo
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2005-05-15'
|
||||
timestamp='2005-12-13'
|
||||
|
||||
# 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
|
||||
|
|
@ -125,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
|
|||
;;
|
||||
,,*) CC_FOR_BUILD=$CC ;;
|
||||
,*,*) CC_FOR_BUILD=$HOST_CC ;;
|
||||
esac ;'
|
||||
esac ; set_cc_for_build= ;'
|
||||
|
||||
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
|
||||
# (ghazi@noc.rutgers.edu 1994-08-24)
|
||||
|
|
@ -199,44 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
||||
echo "${machine}-${os}${release}"
|
||||
exit ;;
|
||||
amd64:OpenBSD:*:*)
|
||||
echo x86_64-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
amiga:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
cats:OpenBSD:*:*)
|
||||
echo arm-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
hp300:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
luna88k:OpenBSD:*:*)
|
||||
echo m88k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
mac68k:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
macppc:OpenBSD:*:*)
|
||||
echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
mvme68k:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
mvme88k:OpenBSD:*:*)
|
||||
echo m88k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
mvmeppc:OpenBSD:*:*)
|
||||
echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
sgi:OpenBSD:*:*)
|
||||
echo mips64-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
sun3:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:OpenBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
|
|
@ -658,8 +623,7 @@ EOF
|
|||
esac
|
||||
if [ ${HP_ARCH} = "hppa2.0w" ]
|
||||
then
|
||||
# avoid double evaluation of $set_cc_for_build
|
||||
test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
|
||||
eval $set_cc_for_build
|
||||
|
||||
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
|
||||
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
|
||||
|
|
@ -805,13 +769,17 @@ EOF
|
|||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
i*:MINGW*:* | i*:windows32*:*)
|
||||
i*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
# uname -m includes "-pc" on this system.
|
||||
echo ${UNAME_MACHINE}-mingw32
|
||||
exit ;;
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
x86:Interix*:[34]*)
|
||||
x86:Interix*:[345]*)
|
||||
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||
exit ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
|
|
@ -826,7 +794,7 @@ EOF
|
|||
i*:UWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-uwin
|
||||
exit ;;
|
||||
amd64:CYGWIN*:*:*)
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-unknown-cygwin
|
||||
exit ;;
|
||||
p*:CYGWIN*:*)
|
||||
|
|
@ -883,7 +851,7 @@ EOF
|
|||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
|
|
@ -902,9 +870,12 @@ EOF
|
|||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
echo or32-unknown-linux-gnu
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
echo powerpc-unknown-linux-gnu
|
||||
exit ;;
|
||||
|
|
@ -948,6 +919,9 @@ EOF
|
|||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
exit ;;
|
||||
|
|
@ -993,7 +967,7 @@ EOF
|
|||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
#ifdef __INTEL_COMPILER
|
||||
#if defined(__INTEL_COMPILER) || defined(__PGI)
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
|
|
@ -1003,7 +977,7 @@ EOF
|
|||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
|
|
@ -1214,7 +1188,7 @@ EOF
|
|||
*:Darwin:*:*)
|
||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||
case $UNAME_PROCESSOR in
|
||||
*86) UNAME_PROCESSOR=i686 ;;
|
||||
i*86) UNAME_PROCESSOR=i686 ;;
|
||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||
esac
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
|
|
@ -1293,6 +1267,9 @@ EOF
|
|||
i*86:skyos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
||||
exit ;;
|
||||
i*86:rdos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-rdos
|
||||
exit ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2005-05-12'
|
||||
timestamp='2005-12-11'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
|
|
@ -119,8 +119,9 @@ esac
|
|||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
|
||||
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
|
|
@ -171,6 +172,10 @@ case $os in
|
|||
-hiux*)
|
||||
os=-hiuxwe2
|
||||
;;
|
||||
-sco6)
|
||||
os=-sco5v6
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5)
|
||||
os=-sco3.2v5
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
|
|
@ -187,6 +192,10 @@ case $os in
|
|||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5v6*)
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco*)
|
||||
os=-sco3.2v2
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
|
|
@ -248,6 +257,7 @@ case $basic_machine in
|
|||
| mips64vr4100 | mips64vr4100el \
|
||||
| mips64vr4300 | mips64vr4300el \
|
||||
| mips64vr5000 | mips64vr5000el \
|
||||
| mips64vr5900 | mips64vr5900el \
|
||||
| mipsisa32 | mipsisa32el \
|
||||
| mipsisa32r2 | mipsisa32r2el \
|
||||
| mipsisa64 | mipsisa64el \
|
||||
|
|
@ -256,13 +266,14 @@ case $basic_machine in
|
|||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| mt \
|
||||
| msp430 \
|
||||
| ns16k | ns32k \
|
||||
| openrisc | or32 \
|
||||
| or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b \
|
||||
|
|
@ -274,6 +285,9 @@ case $basic_machine in
|
|||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m32c)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
|
|
@ -281,6 +295,9 @@ case $basic_machine in
|
|||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||
;;
|
||||
ms1)
|
||||
basic_machine=mt-unknown
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
# because (1) that's what they normally are, and
|
||||
|
|
@ -322,6 +339,7 @@ case $basic_machine in
|
|||
| mips64vr4100-* | mips64vr4100el-* \
|
||||
| mips64vr4300-* | mips64vr4300el-* \
|
||||
| mips64vr5000-* | mips64vr5000el-* \
|
||||
| mips64vr5900-* | mips64vr5900el-* \
|
||||
| mipsisa32-* | mipsisa32el-* \
|
||||
| mipsisa32r2-* | mipsisa32r2el-* \
|
||||
| mipsisa64-* | mipsisa64el-* \
|
||||
|
|
@ -330,6 +348,7 @@ case $basic_machine in
|
|||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
|
|
@ -337,7 +356,7 @@ case $basic_machine in
|
|||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
|
|
@ -352,6 +371,8 @@ case $basic_machine in
|
|||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
m32c-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
|
|
@ -687,6 +708,9 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
os=-msdos
|
||||
;;
|
||||
ms1-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
|
|
@ -762,9 +786,8 @@ case $basic_machine in
|
|||
basic_machine=hppa1.1-oki
|
||||
os=-proelf
|
||||
;;
|
||||
or32 | or32-*)
|
||||
openrisc | openrisc-*)
|
||||
basic_machine=or32-unknown
|
||||
os=-coff
|
||||
;;
|
||||
os400)
|
||||
basic_machine=powerpc-ibm
|
||||
|
|
@ -851,6 +874,10 @@ case $basic_machine in
|
|||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rdos)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
rom68k)
|
||||
basic_machine=m68k-rom68k
|
||||
os=-coff
|
||||
|
|
@ -1090,12 +1117,9 @@ case $basic_machine in
|
|||
we32k)
|
||||
basic_machine=we32k-att
|
||||
;;
|
||||
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
|
|
@ -1176,13 +1200,15 @@ case $os in
|
|||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
|
@ -1200,7 +1226,7 @@ case $os in
|
|||
os=`echo $os | sed -e 's|nto|nto-qnx|'`
|
||||
;;
|
||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
|
||||
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
|
||||
;;
|
||||
-mac*)
|
||||
|
|
@ -1389,6 +1415,9 @@ case $basic_machine in
|
|||
*-be)
|
||||
os=-beos
|
||||
;;
|
||||
*-haiku)
|
||||
os=-haiku
|
||||
;;
|
||||
*-ibm)
|
||||
os=-aix
|
||||
;;
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
12
configure.in
12
configure.in
|
|
@ -14,9 +14,6 @@ AC_CONFIG_HEADERS([include/sane/config.h])
|
|||
AC_PREREQ(2.54)dnl dnl Minimum Autoconf version required.
|
||||
AC_ARG_PROGRAM
|
||||
|
||||
AC_NEED_BYTEORDER_H([include/byteorder.h])
|
||||
AX_NEED_STDINT_H([include/_stdint.h])
|
||||
|
||||
PACKAGE=AC_PACKAGE_NAME
|
||||
VERSION=AC_PACKAGE_VERSION
|
||||
NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
|
||||
|
|
@ -74,6 +71,9 @@ if test "$MAKEDEPEND" != "no"; then
|
|||
fi
|
||||
AC_SUBST(DEPEND_RECURSIVE)
|
||||
|
||||
CROSS_COMPILING=$cross_compiling
|
||||
AC_SUBST(CROSS_COMPILING)
|
||||
|
||||
dnl ***********************************************************************
|
||||
dnl set compiler/linker flags
|
||||
dnl ***********************************************************************
|
||||
|
|
@ -91,6 +91,9 @@ AC_AIX
|
|||
AC_MINIX
|
||||
AC_ISC_POSIX
|
||||
|
||||
AC_NEED_BYTEORDER_H([include/byteorder.h])
|
||||
AX_NEED_STDINT_H([include/_stdint.h])
|
||||
|
||||
dnl ***********************************************************************
|
||||
dnl Checks for libraries
|
||||
dnl ***********************************************************************
|
||||
|
|
@ -127,7 +130,8 @@ AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.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 \
|
||||
dev/ppbus/ppi.h machine/cpufunc.h usb.h sys/bitypes.h sys/sem.h sys/poll.h \
|
||||
IOKit/cdb/IOSCSILib.h IOKit/scsi-commands/SCSICommandOperationCodes.h \
|
||||
IOKit/cdb/IOSCSILib.h IOKit/scsi/SCSICommandOperationCodes.h \
|
||||
IOKit/scsi-commands/SCSICommandOperationCodes.h \
|
||||
windows.h be/kernel/OS.h be/drivers/USB_scanner.h limits.h sys/ioctl.h asm/types.h\
|
||||
netinet/in.h)
|
||||
AC_CHECK_HEADERS([asm/io.h],,,[#include <sys/types.h>])
|
||||
|
|
|
|||
|
|
@ -75,8 +75,12 @@ MAN2HTML= nroff -man |\
|
|||
-cgiurl '$$title.$$section.html'|\
|
||||
sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
|
||||
|
||||
ifeq (@CROSS_COMPILING@,no)
|
||||
HTML_PAGES = sane-backends.html sane-backends-external.html \
|
||||
sane-mfgs.html sane-mfgs-external.html
|
||||
else
|
||||
HTML_PAGES =
|
||||
endif
|
||||
|
||||
ifeq (@USE_LATEX@,no)
|
||||
STANDARD =
|
||||
|
|
|
|||
|
|
@ -122,6 +122,10 @@
|
|||
<IOKit/scsi-commands/SCSICommandOperationCodes.h> header file. */
|
||||
#undef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
|
||||
/* Define to 1 if you have the <IOKit/scsi/SCSICommandOperationCodes.h> header
|
||||
file. */
|
||||
#undef HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H
|
||||
|
||||
/* Define to 1 if you have the `ioperm' function. */
|
||||
#undef HAVE_IOPERM
|
||||
|
||||
|
|
@ -179,6 +183,9 @@
|
|||
/* Define to 1 if you have a working `mmap' system call. */
|
||||
#undef HAVE_MMAP
|
||||
|
||||
/* Define to 1 if you have the <netinet/in.h> header file. */
|
||||
#undef HAVE_NETINET_IN_H
|
||||
|
||||
/* Define to 1 if you have the `NSLinkModule' function. */
|
||||
#undef HAVE_NSLINKMODULE
|
||||
|
||||
|
|
@ -371,9 +378,6 @@
|
|||
/* Define to 1 if you have the <windows.h> header file. */
|
||||
#undef HAVE_WINDOWS_H
|
||||
|
||||
/* Define to 1 if you have the <netinet/in.h> header file. */
|
||||
#undef HAVE_NETINET_IN_H
|
||||
|
||||
/* Define to 1 if you have the `_portaccess' function. */
|
||||
#undef HAVE__PORTACCESS
|
||||
|
||||
|
|
@ -424,7 +428,7 @@
|
|||
|
||||
/* If using the C implementation of alloca, define if you know the
|
||||
direction of stack growth for your system; otherwise it will be
|
||||
automatically deduced at run-time.
|
||||
automatically deduced at runtime.
|
||||
STACK_DIRECTION > 0 => grows toward higher addresses
|
||||
STACK_DIRECTION < 0 => grows toward lower addresses
|
||||
STACK_DIRECTION = 0 => direction of growth unknown */
|
||||
|
|
@ -480,7 +484,7 @@
|
|||
/* Define scsireq_t as \`struct scsireq\' if necessary. */
|
||||
#undef scsireq_t
|
||||
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
/* Define socklen_t as \`int\' if necessary. */
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -185,6 +185,7 @@
|
|||
# include <apollo/time.h>
|
||||
# include "sanei_DomainOS.h"
|
||||
#elif defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
|
||||
# define USE MACOSX_INTERFACE
|
||||
# include <CoreFoundation/CoreFoundation.h>
|
||||
|
|
@ -193,6 +194,13 @@
|
|||
# include <IOKit/IOCFPlugIn.h>
|
||||
# include <IOKit/cdb/IOSCSILib.h>
|
||||
# endif
|
||||
# ifdef HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H
|
||||
/* The def of VERSION causes problems in the following include files */
|
||||
# undef VERSION
|
||||
# include <IOKit/scsi/SCSICmds_INQUIRY_Definitions.h>
|
||||
# include <IOKit/scsi/SCSICommandOperationCodes.h>
|
||||
# include <IOKit/scsi/SCSITaskLib.h>
|
||||
# else
|
||||
# ifdef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
/* The def of VERSION causes problems in the following include files */
|
||||
# undef VERSION
|
||||
|
|
@ -200,6 +208,7 @@
|
|||
# include <IOKit/scsi-commands/SCSICommandOperationCodes.h>
|
||||
# include <IOKit/scsi-commands/SCSITaskLib.h>
|
||||
# endif
|
||||
# endif
|
||||
#elif defined (HAVE_WINDOWS_H)
|
||||
# define USE WIN32_INTERFACE
|
||||
# include <windows.h>
|
||||
|
|
@ -1162,7 +1171,8 @@ sanei_scsi_open (const char *dev, int *fdp,
|
|||
}
|
||||
#elif USE == MACOSX_INTERFACE
|
||||
{
|
||||
# ifdef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
# if defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
|
||||
len = strlen (dev);
|
||||
if (len > 2 && len % 2 == 0 && dev [0] == '<' && dev [len - 1] == '>')
|
||||
{
|
||||
|
|
@ -5269,7 +5279,8 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
|
|||
|
||||
# endif /* ifdef HAVE_IOKIT_CDB_IOSCSILIB_H */
|
||||
|
||||
# ifdef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
# if defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
|
||||
|
||||
static
|
||||
void CreateMatchingDictionaryForSTUC (SInt32 peripheralDeviceType,
|
||||
|
|
@ -5792,7 +5803,8 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
|
|||
void *dst, size_t * dst_size)
|
||||
{
|
||||
if (fd_info[fd].pdata)
|
||||
# ifdef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
# if defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
|
||||
return sanei_scsi_cmd2_stuc_api (fd, cmd, cmd_size, src, src_size,
|
||||
dst, dst_size);
|
||||
# else
|
||||
|
|
@ -5814,7 +5826,8 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
|
|||
int findlun,
|
||||
SANE_Status (*attach) (const char *dev))
|
||||
{
|
||||
# ifdef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
|
||||
# if defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
|
||||
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
|
||||
sanei_scsi_find_devices_stuc_api (findvendor, findmodel, findtype,
|
||||
findbus, findchannel, findid,
|
||||
findlun, attach);
|
||||
|
|
|
|||
|
|
@ -53,8 +53,15 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
|
|||
|
||||
@SET_MAKE@
|
||||
|
||||
DESTINATIONS = sane-find-scanner sane-config umax_pp gamma4scanimage sane-desc \
|
||||
hotplug/libsane.usermap hotplug-ng/libsane.db udev/libsane.rules hal/libsane.fdi
|
||||
ifeq (@CROSS_COMPILING@,no)
|
||||
HOTPLUG_SCRIPTS = hotplug/libsane.usermap hotplug-ng/libsane.db \
|
||||
udev/libsane.rules hal/libsane.fdi
|
||||
else
|
||||
HOTPLUG_SCRIPTS =
|
||||
endif
|
||||
|
||||
DESTINATIONS = sane-find-scanner sane-config umax_pp gamma4scanimage \
|
||||
sane-desc $(HOTPLUG_SCRIPTS)
|
||||
|
||||
EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo \
|
||||
../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue