tools/create-ccan-tree: Add --build-type=automake

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index d5a23c2a8503ec39ffd38e842ec45baaf5a51637..63fa46fa9a3e3240d6b271099aff1cdd429ce535 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -164,7 +164,7 @@ static struct test tests[] = {
        { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL,
          "#include <sys/types.h>\n"
          "#include <sys/stat.h>\n"
-         "#include <sys/fcntl.h>\n"
+         "#include <fcntl.h>\n"
          "int main(void) {\n"
          "     return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n"
          "}\n" },
@@ -200,6 +200,8 @@ static struct test tests[] = {
          "}\n" },
        { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
          "return ({ int x = argc; x == argc ? 0 : 1; });" },
+       { "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, /* Solaris needs this for FIONREAD */
+         "#include <sys/filio.h>\n" },
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
        { "HAVE_UTIME", DEFINES_FUNC, NULL,