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 · 2009-02-19 18:10:12 +00:00 · cb4fb37eca
commit cb4fb37eca
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2009-02-19 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
+	* configure.in, Makefile.am, backend/Makefile.am: 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 Julien Blache <jb@jblache.org>
 	* configure.in: add --enable-libusb_1_0 and check for libusb-1.0
 	using pkg-config.
--- a/Makefile.am
+++ b/Makefile.am
@ -64,10 +64,8 @@ libcheck:
 # Run testsuite any time installcheck or distcheck is ran.
 # Must run testsuite after install or else shared library backends
 # will not be found (including test backend).
-# TODO: The test backend isn't working in current CVS.  Once
-# working again, uncomment the following line.
-#installcheck-local:
-#	cd testsuite && $(MAKE) test.local
+installcheck-local:
+	cd testsuite && $(MAKE) test.local

 $(distdir).lsm: dist $(PACKAGE).lsm
 	( cat $(PACKAGE).lsm | \
--- a/Makefile.in
+++ b/Makefile.in
@ -142,6 +142,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -207,6 +209,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@ -692,7 +695,7 @@ install-pdf: install-pdf-recursive

 install-ps: install-ps-recursive

-installcheck-am:
+installcheck-am: installcheck-local

 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@ -729,11 +732,11 @@ uninstall-am: uninstall-dist_docDATA
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-dist_docDATA
+	install-strip installcheck installcheck-am installcheck-local \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_docDATA

 sort-cvsignore:
 	for f in `find . -name .cvsignore`; do \
@ -776,10 +779,8 @@ libcheck:
 # Run testsuite any time installcheck or distcheck is ran.
 # Must run testsuite after install or else shared library backends
 # will not be found (including test backend).
-# TODO: The test backend isn't working in current CVS.  Once
-# working again, uncomment the following line.
-#installcheck-local:
-#	cd testsuite && $(MAKE) test.local
+installcheck-local:
+	cd testsuite && $(MAKE) test.local

 $(distdir).lsm: dist $(PACKAGE).lsm
 	( cat $(PACKAGE).lsm | \
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@ -3,7 +3,6 @@
 ##
 ##  This file is part of the "Sane" build infra-structure.  See
 ##  included LICENSE file for license information.
-configdir = ${sysconfdir}/sane.d

 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@ -1320,6 +1320,8 @@ LIBS = @LIBS@

 # LIBTOOL install is a little to noisy for my liking.
 LIBTOOL = @LIBTOOL@ --silent
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -1385,6 +1387,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@ -1420,7 +1423,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-configdir = ${sysconfdir}/sane.d
 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane"
 AM_LDFLAGS = @STRICT_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
--- a/9088
+++ b/9088
--- a/configure.in
+++ b/configure.in
@ -479,10 +479,14 @@ AC_ARG_WITH(lockdir, AC_HELP_STRING([--with-lockdir=DIR],
                                    [locksanedir=$withval],[locksanedir=${localstatedir}/lock/sane])
 AC_SUBST(locksanedir)

+configdir="${sysconfdir}/sane.d"
+AC_SUBST(configdir)
+
 dnl ***********************************************************************
 dnl enable/disable backends and features based on previous tests and user's
 dnl choice
 dnl ***********************************************************************
+
 CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
 	  -DPATH_SANE_DATA_DIR=\$(datadir) \
 	  -DPATH_SANE_LOCK_DIR=\$(locksanedir) \
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -134,6 +134,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -199,6 +201,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
--- a/frontend/Makefile.in
+++ b/frontend/Makefile.in
@ -146,6 +146,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -211,6 +213,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
--- a/include/Makefile.in
+++ b/include/Makefile.in
@ -117,6 +117,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -182,6 +184,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
--- a/include/sane/config.h.in
+++ b/include/sane/config.h.in
@ -1,5 +1,8 @@
 /* include/sane/config.h.in.  Generated from configure.in by autoheader.  */

+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
   systems. This function is required for `alloca.c' support on those systems.
   */
@ -472,26 +475,44 @@
 /* Define if pthreads should be used instead of forked processes. */
 #undef USE_PTHREAD

+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to the version of the distribution. */
 #undef VERSION

 /* define if Avahi support is enabled for saned and the net backend */
 #undef WITH_AVAHI

-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
 #endif

 /* Define to 1 if on MINIX. */
@ -504,17 +525,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE

-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -128,6 +128,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -193,6 +195,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
--- a/sanei/Makefile.in
+++ b/sanei/Makefile.in
@ -142,6 +142,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -207,6 +209,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@ -5,7 +5,7 @@
 ##  included LICENSE file for license information.

 SCANIMAGE = ../frontend/scanimage
-TESTFILE  = testfile.pnm
+TESTFILE  = $(srcdir)/testfile.pnm
 OUTFILE   = outfile.pnm
 DEVICE    = test
 OPTIONS   = --mode Color --depth 16 --test-picture "Color pattern" --resolution 50 -y 20 -x 20 > $(OUTFILE)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@ -104,6 +104,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -169,6 +171,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@ -205,7 +208,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SCANIMAGE = ../frontend/scanimage
-TESTFILE = testfile.pnm
+TESTFILE = $(srcdir)/testfile.pnm
 OUTFILE = outfile.pnm
 DEVICE = test
 OPTIONS = --mode Color --depth 16 --test-picture "Color pattern" --resolution 50 -y 20 -x 20 > $(OUTFILE)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -145,6 +145,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LINKER_RPATH = @LINKER_RPATH@
@ -210,6 +212,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@