From 2e46b369c7e23dab8ffe5bf9081e0272d5e3f877 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sat, 9 Jun 2001 10:38:44 +0000 Subject: [PATCH] Check for sys/sem.h and disable snapscan if it isn't available. Removed "//" (C++-style comment) from config.h.in. Henning Meier-Geinitz --- backend/Makefile.in | 2 +- include/sane/config.h.in | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/Makefile.in b/backend/Makefile.in index 86865ecd8..24a6387f2 100644 --- a/backend/Makefile.in +++ b/backend/Makefile.in @@ -55,7 +55,7 @@ COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS) PRELOADABLE_BACKENDS = abaton agfafocus apple artec as6e avision bh canon \ coolscan dc25 @DC210@ @DC240@ dmc epson hp m3096g microtek microtek2 \ mustek mustek_pp nec @NET@ pie @PINT@ plustek @PNM@ @QCAM@ ricoh \ - s9036 sharp @SM3600@ snapscan sp15c st400 tamarack umax umax_pp @V4L@ + s9036 sharp @SM3600@ @SNAPSCAN@ sp15c st400 tamarack umax umax_pp @V4L@ ALL_BACKENDS = $(PRELOADABLE_BACKENDS) dll LIBS = $(addprefix libsane-,$(addsuffix .la,$(ALL_BACKENDS))) diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 709cead5f..12100acc1 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -51,7 +51,7 @@ #ifdef NEED_SYS_BITYPES_H # include -#else // not NEED_SYS_BITYPES_H +#else /* not NEED_SYS_BITYPES_H */ /* Define to `unsigned char' if doesn't define. */ #undef u_char @@ -71,7 +71,7 @@ /* Define to `unsigned int' if doesn't define. */ #undef u_int32_t -#endif // not NEED_SYS_BITYPES_H +#endif /* not NEED_SYS_BITYPES_H */ /* Define to `long' if doesn't define. */ #undef ssize_t @@ -347,6 +347,9 @@ /* Define if you have sys/bitypes.h. */ #undef HAVE_SYS_BITYPES_H +/* Define if you have sys/sem.h. */ +#undef HAVE_SYS_SEM_H + /* Define if you have the header file. */ #undef HAVE_UNISTD_H