Wykres commitów

86 Commity (65773982fe82b60173cd5703cc8667c748e09eb9)

Autor SHA1 Wiadomość Data
Chris Bagwell 05c2825f17 Default enable_dynamic to yes/no based on librarys
My previous try was always defaulting to "yes" and user
and to manually specify --disable-dynamic to work correctly
on platforms that didn't support dynamic loading.
2011-11-09 21:46:12 -06:00
m. allan noah 483b0dc488 adding new kvs40xx backend 2011-06-06 14:28:55 -04:00
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 cc75fa5dc2 add --enable-rpath option to configure
Allow user to configure support for rpath compiler
option.  Ported from Fedora's sane-backend patches.

Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2010-04-05 15:54:39 -05:00
m. allan noah d01f0a38f2 missing '$' 2010-02-10 19:46:51 -05:00
Chris Bagwell 41a6a5d7cd Fix and cleanup PTHREAD linking.
Add in missing $PTHREAD_LIBS to all backends that can make use of it.
Rename --enable-fork-process to --enable-pthread to maatch internal
logic.  Also, stop linking in pthreads needlessly if its been
disabled.
2009-05-04 21:01:42 -05: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 9d1375fd7e * acinclude.m4, tools/sane-config.in: Add in missing libraries
to sane-config missed during fix to stop using LIBS to link everything.
Add back in code to move LDFLAGS out of $GPHOTO2_LIBS and into
GPHOTO2_LDFLAGS.
2009-03-03 02:53:42 +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 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 4dab269c71 Restore the removed DYNAMIC_FLAG configuration. 2009-02-01 13:43:26 +00:00
Chris Bagwell 674b884f29 * acinclude.m4, configure.in: Define JPEG objects based on
existence of JPEG library and not on the dc* backends alone
since more backends then that use JPEG support.
* backend/Makefile.am: whitespace fixes.
2009-01-31 20:40:42 +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
Mattias Ellert 93e856b53f Cross compilation fixes and libtool update 2007-11-10 07:12:55 +00:00
Mattias Ellert c2df6b9677 Fix autogenerated files 2007-01-20 09:55:10 +00:00
Jon Chambers b584612aae added dell1600n_net to the build
removed #include <sys/select.h>
2006-05-24 20:56:15 +00:00
Henning Geinitz 947339db25 Run "makedepend" if it's available. This way "make" builds
backends correctly even if only included files (e.g. headers) are
	  changed. Don't be too verbose when running makedepend.
	  Create links libsane-*.so.1 to the real library files if the
	  links are not there. This fixes dynamic loading on OpenBSD. The
	  links are not created for MacOS X as they don't work there.
	  Remove any libsane.* links in /usr/local/lib/sane. Such links
	  are created by libtool. As they point to libsane-v4l.so,
	  scanimage -L doesn't find any scanner in case of ld.so
	  misconfigurations.
	  The install target is much quiter now and prints the libtool
	  message only once now.
2005-10-29 20:01:54 +00:00
Henning Geinitz bc30f776cc Fixed check for libpthread functions. 2005-10-17 17:50:16 +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 8561c6a6bd Added mustek_usb backend which supports the Mustek BearPaw 2448 TA Pro. Changes
of the code before inclusion to CVS can be found in
doc/mustek_usb2/mustek_usb2.CHANGES.
2005-10-03 13:27:03 +00:00
Mattias Ellert 007bd9e9f6 Fix disabling of locking when locking group does not exist 2005-09-07 16:50:02 +00:00
Mattias Ellert dcec1b5385 Updated from libtool 1.5.18. 2005-08-21 08:12:42 +00:00
Gerhard Jaeger 513d6182bc Locking feature will be disabled on OS/2 per default. 2005-08-08 07:41:10 +00:00
Henning Geinitz 4fcd19f065 Avoid error messages in locking test. Make sure that io/cam/cam.h header file
will be detected correctly.
2005-07-30 16:39:00 +00:00
Gerhard Jaeger 3757078c34 The Locking feature will now be disabled, when the selected group
could not be set. The configuration script should not fail any longer.
2005-04-11 07:49:14 +00:00
Gerhard Jaeger 431590a9c6 Added --enable-locking and --with-group to enable device locking via
sanei_access-lib and to specify the group of the locking directory.
2005-04-01 13:54:32 +00:00
Henning Geinitz ddbcb1bf54 Update to libtool 1.5.10. 2004-10-11 16:03:03 +00:00
Peter Fales 2f9b6bb8b3 When using pkg-config to get library flags for gphoto2, any
extra flags (such as -L) must be passed to sane-config.in so
that it can find the libraries in a non-standard location.
(Bug #300686)
2004-07-03 18:08:15 +00:00
Peter Fales cfe712c392 In addition to using pkg-config to find the gphoto2 library flags,
we should check to see whether it's actually possible to link
a program using those flags.
2004-06-19 19:16:54 +00:00
Peter Fales 6fa5850937 2004-05-30 Peter Fales <peter@fales-lorenz.net>
* acinclude.m4, aclocal.m4, configure.in, configure
	Use pkg-config rather than gphoto2-config to get gphoto
	build parameters (bug #300686)
2004-05-30 18:55:35 +00:00
Henning Geinitz c959d2a2ee Don't use -ansi on MacOS X. 2004-04-18 14:35:37 +00:00
Henning Geinitz e7152b70df If the test for gphoto2-config fails, don't call it later. 2004-04-17 18:15:10 +00:00
Henning Geinitz 0777c60aa7 Don't include linux/videodev.h kernel header anymore. Use own defines
instead. Fixes bug #300324.
2003-12-21 22:51:42 +00:00
Peter Fales acd9a6d0e5 Remove "enabling GPHOTO2" messages printed by configure 2003-12-08 04:12:40 +00:00
Peter Fales ef9a9beac0 gphoto2 backend is now enabled by default (and gphoto2-config is found) 2003-12-07 04:28:14 +00:00
Henning Geinitz 3c18d9a960 Include all the headers we also include in backend/v4l.c to make sure we find
all problems.
2003-11-16 17:58:02 +00:00
Henning Geinitz b9cd7aec55 Changed check for linux/videodev.h. If that file is not compilable, we don't
build the v4l backend. That's to avoid compilation errors if videov.h from Linux
kernel 2.6.* is used.
2003-11-16 16:25:53 +00:00
Gerhard Jaeger 8e71497aa1 Added -D_REENTRANT to compiler flags, when using pthread support. 2003-10-17 11:07:42 +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
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 c0e95a8f63 Fixed MacOS X build (patch from Mattias Ellert <mattias.ellert@tsl.uu.se>). 2003-05-15 11:01:14 +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 06dc21afb4 Added support for -framework option and check for IOKit for MacOS X. Check for
latex tools. Minimum autoconf version is 2.54.
2003-04-30 23:00:15 +00:00
Henning Geinitz 9c60c54fe5 New libtool upstream realease: 1.5. 2003-04-30 20:29:23 +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