From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 27 Sep 2015 08:20:20 +0200
Subject: merge to 1.0.25+git20150927

---
 include/sane/config.h.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'include/sane/config.h.in')

diff --git a/include/sane/config.h.in b/include/sane/config.h.in
index c62938b..8549c46 100644
--- a/include/sane/config.h.in
+++ b/include/sane/config.h.in
@@ -61,9 +61,6 @@
 /* Define to 1 if you have the `cfmakeraw' function. */
 #undef HAVE_CFMAKERAW
 
-/* Is /usr/include/cups/cups.h available? */
-#undef HAVE_CUPS
-
 /* Define to 1 if you have the <ddk/ntddscsi.h> header file. */
 #undef HAVE_DDK_NTDDSCSI_H
 
@@ -454,9 +451,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define to the name of the distribution. */
 #undef PACKAGE
 
@@ -490,6 +484,9 @@
 /* SANE DLL minor number */
 #undef SANE_DLL_V_MINOR
 
+/* Define to 1 if you have the <sys/io.h> providing inb,outb. */
+#undef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
+
 /* SCSI command buffer size */
 #undef SCSIBUFFERSIZE
 
-- 
cgit v1.2.3