As we require pkg-config anyway, simply let sane-config use it to make
it compatible with multilib systems. Previously, sane-config contained
paths which were different on e.g. x86_64 and i386 which made the 64 and
32 bit versions conflict if installed in parallel.
Not quite ready to support pkg-config yet but go ahead and provide
basic support in configure to discourage distributions that are
patching pkg-config support in to no longer run "autoreconf -f"
and wiping out our custom libtool. sane-backends.pc will not
be installed currently.
Also, fixed a LDFLAGS bug in sane-config for GPHOTO2 support.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
resmgr library is only used (optionally) by
sanei_usb and sanei_scsi. So only need to
link it in for those backends. This was
a stray piece from initial cleanup of LIBS
in sane-backends 1.0.20.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
with newer automake.
* backend/Makefile.am, tools/sane-config.in: Add missing
$GPHOTO2_LDFLAGS so library can be found.
* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
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.
(from Tim Waugh <twaugh@redhat.com>). Really check for entries in $cflags that
are also in $includedir.
Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES
Added detection of the TA for the Paragon 1200 SP Pro. Added
warning about not supported Trust scanners. Changed description
of contarst and brightness settings. Backend status is "stable"
now. New version: 1.0-106.
* acinclude.m4 aclocal.m4: Fixed comment concerning dc240.
* configure configure.in include/sane/config.h.in: Added test for
socklen_t in sys/socket.h. This fixes the compilation problem on
Irix.
* doc/sane-avision.man doc/sane-ricoh.man doc/sane-s9036.man
doc/sane-tamarack.man: find-scanner is now called
sane-find-scanner and installed on the system so it's not
necessary to point to the tools directory.
* frontend/scanimage.c: Fixed too long line in output.
* sane-config.in: Name is sane-config again (was sane-backends-config
due to the renaming of the package).
* TODO: Removed entry about net.c not compiling on Irix and
references to find-scanner in the man pages. Updated numbers of
the compilation warnings. Still too many, however.
Nils Philippsen