Wykres commitów

79 Commity (b2a03448857633f6146833e5dbb0283f332b008b)

Autor SHA1 Wiadomość Data
Chris Bagwell 3c21ae5f70 Fix cygwin compile. Initial mingw cleanup.
cygwin and mingw is now hiding M_PI_2 defines with -ansi flag.
Remove to fix cygwin compile.
Mingw doesn't support fork() so default to pthreads.
Add u_short to complete definition of u_* types which helps out mingw
when we define _BSDTYPES_DEFINED.

Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2010-04-07 20:43:32 -05:00
Chris Bagwell 1903d646b2 align autoconf/automake output to common version.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2010-02-27 23:27:32 -06:00
Stéphane Voltz b37621d86a addition of the p5 backend to the distribution 2010-02-15 22:15:43 +01:00
m. allan noah afc0dc6ed3 * acinclude.m4, backend/gphoto2.c, configure, include/sane/config.h.in:
deal with upcoming gphoto2 interface change (patch by Chris Bagwell)
* po/sane-backends.nl.po: updates from Martin Kho
2009-04-30 13:58:35 +00:00
Chris Bagwell 70f3fdfba4 * acinclude.m4, backend/*.[ch], tools/*.[ch], frontend/*.[ch]:
Global replace of u_int??_t with C9x standard based uintxx_t
 in order to remove some tricky and overlapping portability logic
 from acinclude.m4 and leave it in only m4/stdint.m4.
2009-02-26 03:15:43 +00:00
Chris Bagwell df7839f587 * configure.in, m4/stdint.m4: Update to latest version to
get latest fixes and use logic to not recreate _stdint.h if
no changes (to prevent unneeded recompiles).
* m4/byteorder.m4: Added support to reuse existing byteorder.h if
no changes to prevent timestamp causing a recompile.
2009-02-25 03:55:33 +00:00
Chris Bagwell cb4fb37eca Have configure define configdir so all makefiles can use
it (fixes bug introduce with sanei converted to automake).
Enable running testsuite during distcheck.
2009-02-19 18:10:12 +00:00
Julien BLACHE ad1a44d92a Add support for libusb-1.0. 2009-02-19 13:57:45 +00:00
Chris Bagwell e380729334 * configure.in, tools/Makefile.am: convert tools to automake.
Add tools/openbsd to distribution package.
* include/Makefile.am: include files should have been installed
under sane/ directory when converted to automake.
* doc/Makefile.am: Cleanup. Use automake's built in support to
install docs within subdirectories.
2009-02-19 02:17:45 +00:00
Chris Bagwell caba90c552 * configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
add cv_ prefix to cached variable.  Remove AC_ARG_PROGRAM as
automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
Cleanup socket detection more by creating only a single
SOCKET_LIBS that contains list of all optional libraries
for any socket related funciton.  Make sure that checks
for socket related functions use SOCKET_LIBS when searching.
Check for getopt_long() and getopt.h.  Make OS/2 use
-no-undefined (same as windows).
* ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26.
* Makefile.am: Cleanups to match configure updates.
* frontend/scanimage.c, include/Makefile.in, lib/getopt.c
lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
Rename internal getopt.h to lgetopt.h to allow using
external getopt.h when it exists.  This allows to go
back to optionally compiling getopt()/getopt_long() and its
prototypes and not have conflicts with external headers/symbols.
2009-02-06 03:10:44 +00:00
Chris Bagwell 0330a4d416 * aclocalm4: fix prototype of internal strcasestr and usleep.
* configure.in: Group all USB logic together and all SCSI
logic together to aid understanding of whats no longer
valid.  Allow sharing enable/disable options between all
USB drivers on multiple platforms.  Combined CAM_LIBS and
SCSI_LIBS since they are mutually exclusive.
Skip some USB/SCSI checks when previous tests show it will always fail.
* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and
SCSI_LIBS. Add missing SOCKET_LIBS to epson2.  Add USB_LIB.
* saned.c: Add limits.h for PATH_MAX.
2009-02-02 03:17:32 +00:00
Mattias Ellert 1d21f36d9f Don't compile sanei_jpeg if libjpeg is unavailable. 2009-02-01 15:21:46 +00:00
Mattias Ellert 7d909bb234 cut and paste error correction. 2009-02-01 14:37:46 +00:00
Chris Bagwell 23ff26f9a5 * acinclude.m4, configure.in: Put all libraries into their
own *_LIB variables instead of $LIB so that we do not have to
link in the world to all executables. Modified SANE_CHECK_U_TYPES
to be a little more portable to platforms that use #define
for u_* types. Create SANE_CHECK_BACKENDS macro so that
PRELOADABLE_BACKENDS can also be valided.  Auto-populated
PRELAODABLE_BACKENDS when detect dlopen() won't work.
Various protability cleanups.
* backend/dll.c: Make dll-preload.c a .h since its an include and
not compilable byitself.
* frontend/Makefile.in, frontend/scanimage.c, include/laaloca.h,
  lib/Makefile.am, lib/alloca.c, strcasestr.c, tools/Makefile.in,
  tools/sane-desc.c: Convert lib/ to automake.  Create a liblib.la
  for everyone to use and a libfelib.la for only frontend programs.
  Make all internal programs be prefixed with sanei_ as not to conflict
  with other programs libsane is linked in with that will also most
  likely create similar internal utils on problem platforms.
  * include/getopt.h, lib/getopt.c, lib/getopt1.c: Always compile
  and link in getopt_long() but prefix it with sanei_.  Its
  easier to always use internal version then try to figure out what
  platforms support getopt_long() and what header files to use.
  * backend/Makefile.am: Convert backend makefile to automake.
  Initial version that is feature parity with original but uses
  specific rules instead of wildcards and only links in libraries/objs
  really required. Room for more cleanup of whats linked in once
  all makefiles have been converted to automake.
2009-01-31 03:12:18 +00:00
Chris Bagwell b52b0c0c14 * backend/epson2.c backend/pixma_bjnp.c, include/sane/sanei_backend.h,
sanei/sanei_tcp.c, sanie/sanei_udp.c: Improve portablity by
  removing usage of MSG_WAITALL since not all platforms support
  that (cygwin).  Default is to be blocking anyways.  Changed
  usage of MSG_NOTWAIT to use fcntl() function as needed as well.
  * configure.in, lib/Makefile.in, lib/strcasestr.c: Add internal
  strcasestr() for platforms missing it (cygwin).
  * pixma_common.c: My source match header prototype for picky
  compilers (cygwin).
  * backend/umax_pp_mid.c: Allow BACKEND_NAME to be filename
  yet debug to be SANE_DEBUG_UMAX_PP to match man page.
2009-01-29 15:10:19 +00:00
Chris Bagwell f385169bcf Convert top-level Makefile to be generated by automake.
"dist" target now includes m4 directory. Updated "libcheck"
target to look at dynamic libraries instead of static.
2009-01-18 02:00:25 +00:00
Nicolas Martin 316027d93d MP800/MP800R fixes and TPU support added, doc updates for MP980 2008-12-21 14:51:26 +00:00
Julien BLACHE f4ff1b74f6 Add mDNS DNS-SD support to saned and the net backend so they can announce
and discover each other automatically.

Optional at configure time, requires Avahi >= 0.6.4.
2008-04-11 17:18:19 +00:00
Mattias Ellert 416a155ca3 make tiffio.h optional 2008-02-02 12:20:46 +00:00
Mattias Ellert 71be983cdd use SCSITaskSGElement if available 2007-11-10 15:44:41 +00:00
Mattias Ellert 93e856b53f Cross compilation fixes and libtool update 2007-11-10 07:12:55 +00:00
Ilia Sotnikov db4174625b + Added HAVE_NETINET_IN_H define (result of the check for <netinet/in.h>
header)
2007-04-24 17:51:40 +00:00
Mattias Ellert c2df6b9677 Fix autogenerated files 2007-01-20 09:55:10 +00:00
Henning Geinitz fb0fd5a88b Disabled compilation warnings for release. 2006-06-29 19:01:38 +00:00
Henning Geinitz e29b6b82c5 Check for pthread_cancel() and pthread_testcancel(). 2005-10-16 20:17:19 +00:00
Henning Geinitz 2f8015cb6a Check for pthread_cancel(). 2005-10-16 20:11:48 +00:00
Henning Geinitz 2d224c4a75 Added support for usb functionality on OS/2 using the usbcalls interface (patch
from Paul Smedley <paul@smedley.info>).
2005-08-07 14:26:33 +00:00
Henning Geinitz 6c3427c52d Changes to support SANE on ZETA. Not all
patches have been applied yet, but it's a start. The backends
	  are not installed as shared libs but as add-ons, which are shared libs
	  but in a specific folder in [/system|~]/config/add-ons/ named SANE/.
	  The install target has been changed to account for this,
	  Some files don't exist in BeOS/ZETA (ipc.h, ...).
	  Bbackend function names get a prefix, I suppose to avoid namespace clashes.
	  Though we do have a libdl to implement dl_open, the native way is prefered.
	  Added a --with-docdir= configure arg.
	  BeOS has a broken get[name|addr]info() from bind. This is fixed in ZETA R1.
	  libtool needs -no-undefined. Various VPATH fixes.
	  Check for <be/drivers/USB_scanner.h>, but not used yet.
	  No S_IFSOCK (sockets are fds to /dev/net/api). Stub pio code, untested.
	  Patch from Francois Revol <revol@free.fr>.
2005-07-15 21:59:25 +00:00
Henning Geinitz 56e3295552 Make sure that getopt is not built on OS/2 (from Franz Bakan <fbakan@gmx.net>). 2005-07-09 13:19:51 +00:00
Gerhard Jaeger 65a32f52e3 ENABLE_LOCKING has been added by automake/autoconf. 2005-04-01 13:53:01 +00:00
Henning Geinitz b145a332e7 Removed dangling quotation mark. 2004-10-06 11:09:14 +00:00
Henning Geinitz 4ddcadc20d Regenerated to include updates from niash and resource manager inclusion. 2004-08-03 17:25:58 +00:00
Mattias Ellert ac9ec0ff1c Missed one... 2004-06-20 01:22:44 +00:00
Henning Geinitz 66f4a68325 sanei_scsi.c should now compile with the new and old SCSI API of MacOS X. Patch
from Mattias Ellert <mattias.ellert@tsl.uu.se>.
2003-12-06 13:38:47 +00:00
Gerhard Jaeger e81cfe2818 Added check for limits.h - HAVE_LIMITS_H. 2003-10-26 10:57:16 +00:00
Gerhard Jaeger 195cacb639 Added checks for iopl. 2003-10-22 07:02:36 +00:00
Gerhard Jaeger 5ceb18a5a6 Added test for setitimer. 2003-10-15 15:40:27 +00:00
Henning Geinitz 3565c78d2f More verbose help messages for --enable-fork-process. Print message about
pthread support after all the tests. If libpthread isn't available, try if libc
supports pthreead_*. Use macro USE_PTHREAD to check if threads are used in the
code.
2003-10-07 11:28:03 +00:00
Gerhard Jaeger 81eaf06a10 * aclocal.m4 acinlcude.m4 configure configure.in: modified checks for
pthread support, added switch --enable-fork-process which toggles
  between the usage of fork and pthread, set the default behaviour to
  pthread usage on Darwin
* include/sane/config.h: added the HAVE_LIBPTHRAD stuff
* sanei/sanei_thread.c include/sane/sanei_thread.h: fixed compilation issue
  on OS/2, added support for fork too, so that we can use sanei_thread
  functions in any case.
* backend/plustek.[ch]: changes due to the sanei_thread-lib work
2003-10-07 07:38:37 +00:00
Gerhard Jaeger 39044887ca * aclocal.m4 configure configure.in: added checks for pthread.h and
added linker option -lpthread if pthread.h is found
* include/sane/config.in.h: added HAVE_PTHREAD_H
* sanei/sanei_thread.c include/sane/sanei_thread.h: added pthread_
  functions to library, so every backend is able to use either fork or
  pthread for its reader-process - see plustek backend for example
* backend/plustek.h backend/plustek.c: added sanei_thread stuff to support
  threading on MacOS X
* backend/plustek_pp*: some cleanup
2003-10-05 16:00:30 +00:00
Frank Zago 3bda0d541d Port to Cygwin. 2003-09-24 03:41:48 +00:00
Stéphane Voltz 929c5c9e75 * backend/sane-umax_pp.c: fix default port address handling
(patch from Malcolm Parsons <malcolm.parsons@virgin.net>)
  	* configure.in configure include/sane/config.h.in: added detection of
	  machine/cpufunc.h and i386_set_ioperm() for FreeBSD support.
2003-09-18 05:17:23 +00:00
Henning Geinitz 64ea3dfc5f Check if ss_family or __ss_family is in struct sockaddr_storage. Otherwise
diasbale ipv6. Patch from Julien BLACHE <jb@jblache.org>.
2003-06-04 19:49:48 +00:00
Henning Geinitz b68941ebfe Added missing HAVE_LIBIEEE1284 macro. The test was there, but the macro wasn't set. 2003-05-08 09:58:14 +00:00
Henning Geinitz e93322e28d Test for poll() and disable IPV6 if not found. 2003-05-02 09:41:12 +00:00
Henning Geinitz bddde95e05 Added test for IOKit. 2003-04-30 23:03:27 +00:00
Stéphane Voltz 2208647618 * added detection of dev/ppbus/ppi.h include (*BSD) 2003-04-18 20:10:56 +00:00
Henning Geinitz 749ceed2e6 Added a switch to disable libusb. Removed switch to enable ipv6
uncondinionally.  Check for sys/poll.h.
2003-04-02 16:21:07 +00:00
Henning Geinitz 088281c4e1 Added support for IPv6. Updated manpages. Patch from Julien BLACHE
<jb@jblache.org>.
2003-03-30 19:07:18 +00:00
Henning Geinitz b8010a3fec Declare prototypes for all functions that may miss on some platforms. 2003-01-24 14:06:08 +00:00