From 25e9a5e13eef6566a6c4c700011a5759d310d35a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 17 Jan 2023 16:23:26 +0100 Subject: [PATCH 1/2] configure: Include for system, exit Otherwise the conf.sanetest check will always fail with compilers that do not support implicit function declarations. --- acinclude.m4 | 1 + aclocal.m4 | 1 + configure | 1 + 3 files changed, 3 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 9c7f451..922e5d1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -484,6 +484,7 @@ dnl AC_TRY_RUN([ #include #include +#include int main () diff --git a/aclocal.m4 b/aclocal.m4 index b83ffbb..88829e4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -494,6 +494,7 @@ dnl AC_TRY_RUN([ #include #include +#include int main () diff --git a/configure b/configure index 427c259..0cc9f61 100755 --- a/configure +++ b/configure @@ -7565,6 +7565,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +#include int main () From d0e542df767431fedc67a60164bff40e5a7395a1 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 17 Jan 2023 16:27:10 +0100 Subject: [PATCH 2/2] configure: Add missing updates Commit 7ebdf2cd6232aa22c78fd9b59951a3e9ee43a715 ("scanadf: fixes for various compilation warnings") missed these updates. --- configure | 2 +- include/sane/config.h.in | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0cc9f61..71c3fa8 100755 --- a/configure +++ b/configure @@ -4864,7 +4864,7 @@ fi -for ac_header in os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h +for ac_header in os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h sys/socket.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/include/sane/config.h.in b/include/sane/config.h.in index baf35be..b8d901d 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -108,6 +108,9 @@ /* Define to 1 if you have the `strtod' function. */ #undef HAVE_STRTOD +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H