Wykres commitów

43 Commity (652da9a378c2dbc850b1f0d216ba0e3dbac82274)

Autor SHA1 Wiadomość Data
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 55434f8a75 Fix disabling getopt compile again. 2009-02-22 05:08:56 +00:00
Chris Bagwell be3f46204b * po/Makefile.am, configure.in: convert remaining directory,
po, to use automake.
2009-02-21 22:45:14 +00:00
Mattias Ellert 0827226249 Adding missing liblib dependencies 2009-02-20 16:51:09 +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
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 aef46252cc convert frontend, include, and sanei directories to use
automake.  Only reference libsanei.la now. Use am_conditional
to compile sanei_jpeg.lo.  distcheck now runs sanei/wire_test.
2009-02-15 03:31:36 +00:00
Chris Bagwell 79086e770e * Makefile.am, configure.in, doc/Makefile.am: Convert
doc/Makefile to use automake. Main difference is that
no longer installs man pages for backends that are not
compiled.  Moved install ownership of $top_srcdir docs
to $top_srcdir's Makefile.
2009-02-14 05:54:01 +00:00
Chris Bagwell 144b1a3cfb * configure.in, backend/Makefile.am: Add back in support for
optionally linking in sanei_jpeg.lo under backend directory;
but using configure and not with GNU make extensions.
Move back to libtool's -version-info instead of -version-number
because the later has known bugs on platforms such as OS/2.
2009-02-07 02:00:51 +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 4dab269c71 Restore the removed DYNAMIC_FLAG configuration. 2009-02-01 13:43:26 +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 e168ad39f3 Run all libcheck tests before failure and look for both static and
shared libraries.  Fixed $srcdir typo in lib/Makefile.in.
2009-01-22 02:23:38 +00:00
Chris Bagwell c90e23a6d2 Updates to Makefiles to prepare for transition to automake.
Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
2009-01-16 23:39:48 +00:00
Mattias Ellert 22efa538b7 Fix warnings about ignored --datarootdir 2008-02-03 06:59:36 +00:00
Ilia Sotnikov fbae3e1b40 * Fixed empty liblib.a, libsanei.a produced by libtool - '-static' flag
is now mentioned in both compile & link stages to tell 'libtool' that static
  library is being built (static libraries are disabled by default when
  configure produces libtool from ltmain.sh).
2007-07-02 17:21:24 +00:00
Ilia Sotnikov b861ff6af5 + Use libtool instead of ar/ranlib, which correctly handles dependencies
(eg. for parallel makes)
2007-06-12 06:38:58 +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 60437d524c Removed #include again, breaks compilation on OS/2. 2003-04-30 09:57:01 +00:00
Henning Geinitz de3256b534 Add missing includes. 2003-04-27 12:51:00 +00:00
Henning Geinitz e82f413b74 Recompile all targets if necessary. 2003-04-02 22:05:26 +00:00
Henning Geinitz 9d038e133e Update to glibc 2.3.1 version. The code is now LGPLed. Changed the K&R style
and added prototypes to avoid warnings.
2003-04-02 21:41:37 +00:00
Henning Geinitz 0b946a428c Update to glibc 2.3.1 version. This fixes a compilation warning. Further more,
the code is now LGPLed.
2003-04-02 21:16:19 +00:00
Henning Geinitz 0064ad99fc Use u_int32_t instead of in in_addr_t which isn't defined at least for OS/2.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-19 19:30:47 +00:00
Henning Geinitz 65df843b33 Only use inet_ntoa if it's available.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-14 19:53:37 +00:00
Henning Geinitz b6b3496b00 Added wrapper for inet_pton(). If this function is not available, try first
inet_aton() and then inet_addr().
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-14 19:34:52 +00:00
Henning Geinitz e3cbda553c Added global list of file patterns for "make distclean". Some "make clean"
and "make distclean" cleanup and additions.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-13 20:48:29 +00:00
Henning Geinitz 8f95b78977 Link to functions in lib/ only if they are not available on the system.
Avoid duplicating list of functions.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-10 18:38:13 +00:00
Henning Geinitz f41f349a16 Removed OS/2 kludge: it's not necessary.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-02-08 21:51:45 +00:00
Henning Geinitz d439aa7678 Fixed problem with header include order on Irix.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-01-27 15:11:44 +00:00
Henning Geinitz 382b9e86e9 Changed order of includes for OS/2 compatibility again.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-01-10 23:35:46 +00:00
Henning Geinitz da933d93d1 Changed order of includes for OS/2 compatibility.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-01-10 20:48:24 +00:00
Henning Geinitz c1b967a5d6 Added target "dist". Fixed .PHONY.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-01-08 19:06:54 +00:00
Henning Geinitz 3c34b9da05 Added implementation of inet_ntop() for platforms withouth this
function based on inet_ntoa.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-01-06 20:43:10 +00:00
Henning Geinitz a0b9f501f8 Used #include "../include/sane/config.h".
Henning Meier-Geinitz <henning@meier-geinitz.de>
2001-05-31 17:36:39 +00:00
Henning Geinitz fdf421eb8c Added target "uninstall".
Henning Meier-Geinitz <henning@meier-geinitz.de>
2001-05-21 20:20:54 +00:00
Oliver Rauch a6e24d3333 2000-12-04 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
* removed usage of gettext, problem with -lintl should be solved:
          - removed usage of gettext from lib/getopt.c
          - removed test for libintl/gettext in configure[.in]                                                                     - removed intllib from frontend/Makfile.in
2000-12-04 20:58:34 +00:00
Jochen Eisinger f0d5bc32ea 2000-11-20 Jochen Eisinger <jochen.eisinger@gmx.net>
* lib/md5.c include/md5.h: added md5 functions from GNU textutils
	* include/sane/sanei_auth.h sanei/sanei_auth.c: implemented new
	  SANE interface for user authorization using MD5 digest
2000-11-20 18:54:21 +00:00
Jochen Eisinger 3e4ae9dce7 2000-11-20 Jochen Eisinger <jochen.eisinger@gmx.net>
* configure configure.in: Added test for /dev/urandom and
	  index() in string.h or strings.h
	* backend/net.c: Fixed SANE_NET_AUTHORIZE call handling
	* doc/net.tex: Clarified definition of SANE_NET_AUTHORIZE, added
	  definition of MD5 authorization
	* doc/sane.tex: Upgraded to version 1.0.2, changed definition of
	  SANE_MAX_USERNAME_LEN & SANE_MAX_PASSWORD_LEN to 128 chars
	* doc/saned.man: added description of SANE_CONFIG_DIR/saned.users
	* doc/scanimage.man: added description of ~/.sane/pass and
	  --accept-md5-only
	* frontend/saned.c: implemented user authorization on a per backend
	  basis
	* frontend/scanimage.c: fixed bug (option -b wasn't present)
	  implemented auth_callback
	* include/sane/sane.h: changed definition of SANE_MAX_USERNAME_LEN &
	  SANE_MAX_PASSWORD_LEN to 128 chars
	* lib/Makefile.in sanei/Makefile.in: updated Makefiles
2000-11-20 18:49:26 +00:00
Petter Reinholdtsen b4a1a513c9 Merge devel (v1.0.3) into head branch. 2000-08-12 15:11:46 +00:00
Petter Reinholdtsen 30ab5e718a Initial revision 1999-08-09 18:06:01 +00:00