aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-08-03 22:43:06 +0900
committerOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-08-03 22:43:06 +0900
commitffd93a9fad10ced31de037f2c6180f328a38b547 (patch)
treed37960eb9a6eee32910bc84c3f85a5d81fb87ce2
parentcb3090cb5472b63d5cdfb5110652f568bd9477ad (diff)
Sync autofoo
-rwxr-xr-xconfigure10
-rw-r--r--include/sane/config.h.in12
-rw-r--r--lib/Makefile.in8
3 files changed, 9 insertions, 21 deletions
diff --git a/configure b/configure
index 9d039d0..bd346a2 100755
--- a/configure
+++ b/configure
@@ -17694,7 +17694,7 @@ fi
for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \
sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
- dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \
+ dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h
do :
@@ -20134,7 +20134,7 @@ for ac_header in IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
IOKit/scsi/SCSICommandOperationCodes.h \
IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \
- camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
+ camlib.h gscdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \
sys/passthrudef.h
do :
@@ -20372,12 +20372,6 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-if sparc64 -q > /dev/null 2>&1 ; then
-
-$as_echo "#define DISABLE_LINUX_SG_IO 1" >>confdefs.h
-
-fi
-
# Multiple platforms can set SCSI_LIBS so do substitution at end.
diff --git a/include/sane/config.h.in b/include/sane/config.h.in
index 3241807..4ca6770 100644
--- a/include/sane/config.h.in
+++ b/include/sane/config.h.in
@@ -11,9 +11,6 @@
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
-/* Should we disable SCSI generic v3? */
-#undef DISABLE_LINUX_SG_IO
-
/* Define to 1 if the system supports IPv6 */
#undef ENABLE_IPV6
@@ -128,6 +125,9 @@
/* Define to 1 if you have the `gp_port_info_get_path' function. */
#undef HAVE_GP_PORT_INFO_GET_PATH
+/* Define to 1 if you have the <gscdds.h> header file. */
+#undef HAVE_GSCDDS_H
+
/* Define to 1 if you have the `i386_set_ioperm' function. */
#undef HAVE_I386_SET_IOPERM
@@ -271,9 +271,6 @@
/* define if you have the resmgr library */
#undef HAVE_RESMGR
-/* Define to 1 if you have the <scdds.h> header file. */
-#undef HAVE_SCDDS_H
-
/* Define to 1 if you have the `scsireq_enter' function. */
#undef HAVE_SCSIREQ_ENTER
@@ -352,9 +349,6 @@
/* Is /usr/include/systemd/sd-daemon.h available? */
#undef HAVE_SYSTEMD
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
/* Define to 1 if you have the <sys/dsreq.h> header file. */
#undef HAVE_SYS_DSREQ_H
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7dc9ae9..754d14c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -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 usleep.c vsyslog.c \
- strdup.c snprintf.c strsep.c inet_ntop.c sigprocmask.c \
- strndup.c inet_pton.c syslog.c isfdtype.c getopt.c sleep.c \
- getenv.c getopt1.c strcasestr.c $(top_srcdir)/depcomp
+ $(top_srcdir)/mkinstalldirs alloca.c vsyslog.c getenv.c \
+ isfdtype.c inet_pton.c getopt1.c usleep.c strcasestr.c \
+ syslog.c sleep.c sigprocmask.c strdup.c strsep.c inet_ntop.c \
+ snprintf.c getopt.c strndup.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 \