aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-09-25 17:04:23 +0900
committerOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-09-25 17:04:23 +0900
commit490c4501c7ca59568bd9611665386c512163b51b (patch)
tree25c61dc84b684576cdf919c5a084c30bc1aa2ee0
parentda49686efe16bc5f7b4ddef18ea0dcb5f7c18d77 (diff)
Sync autofoo
-rwxr-xr-xconfigure14
-rw-r--r--tools/Makefile.in10
2 files changed, 21 insertions, 3 deletions
diff --git a/configure b/configure
index a0add3a..623864a 100755
--- a/configure
+++ b/configure
@@ -670,6 +670,8 @@ COMPILE_SANED_TRUE
configdir
locksanedir
SCSI_LIBS
+have_usblib_FALSE
+have_usblib_TRUE
USB_LIBS
USB_CFLAGS
SYSTEMD_LIBS
@@ -20128,6 +20130,14 @@ if test xyes = "x$with_usb" && test xyes != "x$have_usb"; then :
as_fn_error $? "USB support requested but required libraries not found." "$LINENO" 5
fi
+ if test x != "x$USB_LIBS"; then
+ have_usblib_TRUE=
+ have_usblib_FALSE='#'
+else
+ have_usblib_TRUE='#'
+ have_usblib_FALSE=
+fi
+
@@ -21504,6 +21514,10 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${have_usblib_TRUE}" && test -z "${have_usblib_FALSE}"; then
+ as_fn_error $? "conditional \"have_usblib\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${COMPILE_SANED_TRUE}" && test -z "${COMPILE_SANED_FALSE}"; then
as_fn_error $? "conditional \"COMPILE_SANED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/tools/Makefile.in b/tools/Makefile.in
index a3ef3b8..77e9d72 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -85,6 +85,7 @@ bin_PROGRAMS = sane-find-scanner$(EXEEXT) gamma4scanimage$(EXEEXT) \
noinst_PROGRAMS = sane-desc$(EXEEXT) $(am__EXEEXT_2)
@INSTALL_UMAX_PP_TOOLS_TRUE@am__append_1 = umax_pp
@INSTALL_UMAX_PP_TOOLS_FALSE@am__append_2 = umax_pp
+@have_usblib_TRUE@am__append_3 = check-usb-chip.c
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \
@@ -122,8 +123,11 @@ am__v_lt_1 =
am_sane_desc_OBJECTS = sane-desc.$(OBJEXT)
sane_desc_OBJECTS = $(am_sane_desc_OBJECTS)
sane_desc_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la
+am__sane_find_scanner_SOURCES_DIST = sane-find-scanner.c \
+ check-usb-chip.c
+@have_usblib_TRUE@am__objects_1 = check-usb-chip.$(OBJEXT)
am_sane_find_scanner_OBJECTS = sane-find-scanner.$(OBJEXT) \
- check-usb-chip.$(OBJEXT)
+ $(am__objects_1)
sane_find_scanner_OBJECTS = $(am_sane_find_scanner_OBJECTS)
sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -197,7 +201,7 @@ am__v_CCLD_1 =
SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \
$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
DIST_SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \
- $(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
+ $(am__sane_find_scanner_SOURCES_DIST) $(umax_pp_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -434,7 +438,7 @@ EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
RenSaneDlls.cmd README xerox hotplug/README \
hotplug/libusbscanner hotplug-ng/README \
hotplug-ng/libsane.hotplug openbsd/attach openbsd/detach
-sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c
+sane_find_scanner_SOURCES = sane-find-scanner.c $(am__append_3)
sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
$(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \
../backend/sane_strstatus.lo