Commit c9623686 authored by Olaf Meeuwissen's avatar Olaf Meeuwissen

Sync autofoo

parent a9c81394
Pipeline #3629415 passed with stage
in 6 minutes and 25 seconds
......@@ -295,8 +295,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -355,6 +353,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -1752,7 +1752,8 @@ ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
-I$(top_srcdir)/include $(USB_CFLAGS) \
-DLIBDIR="\"$(libdir)/sane\""
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS)
AR = @AR@
......@@ -1815,8 +1816,6 @@ 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@
LIPO = @LIPO@
......@@ -1875,6 +1874,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
This diff is collapsed.
......@@ -222,8 +222,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -282,6 +280,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -253,8 +253,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -313,6 +311,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -231,8 +231,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -291,6 +289,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -50,9 +50,6 @@
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
/* Define to 1 if you have the <be/drivers/USB_scanner.h> header file. */
#undef HAVE_BE_DRIVERS_USB_SCANNER_H
/* Define to 1 if you have the <be/kernel/OS.h> header file. */
#undef HAVE_BE_KERNEL_OS_H
......@@ -199,11 +196,11 @@
/* Define to 1 if you have the net-snmp library. */
#undef HAVE_LIBSNMP
/* Define to 1 if you have libusb. */
/* Define to 1 if you have libusb-1.0 */
#undef HAVE_LIBUSB
/* Define to 1 if you have libusb-1.0. */
#undef HAVE_LIBUSB_1_0
/* Define to 1 if you have libusb-0.1 */
#undef HAVE_LIBUSB_LEGACY
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
......
......@@ -275,8 +275,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -335,6 +333,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -80,10 +80,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs alloca.c getenv.c strndup.c \
strdup.c isfdtype.c usleep.c inet_pton.c inet_ntop.c \
snprintf.c vsyslog.c syslog.c getopt1.c strsep.c getopt.c \
sleep.c sigprocmask.c strcasestr.c $(top_srcdir)/depcomp
$(top_srcdir)/mkinstalldirs alloca.c sigprocmask.c inet_pton.c \
usleep.c isfdtype.c snprintf.c vsyslog.c getopt1.c strsep.c \
strndup.c strcasestr.c getopt.c syslog.c sleep.c getenv.c \
inet_ntop.c strdup.c $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
......@@ -236,8 +236,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -296,6 +294,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -187,7 +187,7 @@ ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include
-I$(top_srcdir)/include $(USB_CFLAGS)
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@
......@@ -248,8 +248,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -308,6 +306,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -243,8 +243,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -303,6 +301,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -399,7 +399,7 @@ ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include
-I$(top_srcdir)/include $(USB_CFLAGS)
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@
......@@ -460,8 +460,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -520,6 +518,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -183,8 +183,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -243,6 +241,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
......@@ -229,7 +229,7 @@ ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include
-I$(top_srcdir)/include $(USB_CFLAGS)
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@
......@@ -290,8 +290,6 @@ LIBINTL = @LIBINTL@
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@
LIPO = @LIPO@
......@@ -350,6 +348,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
TIFF_LIBS = @TIFF_LIBS@
USB_CFLAGS = @USB_CFLAGS@
USB_LIBS = @USB_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment