diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2018-04-03 20:38:05 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2018-04-03 20:38:05 +0000 |
| commit | 413d05f16d328249b17a88d22247b5d5f521f743 (patch) | |
| tree | 33432924416591893861df46010b9ffac7292fe8 | |
| parent | d780013a2a42100f8e732d0797c8ec68773d83db (diff) | |
| download | libapr-413d05f16d328249b17a88d22247b5d5f521f743.tar.gz | |
Merge r1827534 from trunk:
configure: fix detection of net/if.h on openbsd.
Depends on sys/socket.h.
PR-61976.
Proposed by: David Carlier <devnexen gmail.com>
Reviewed by: ylavic
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1828284 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 1.6.4 + *) configure: Fix detection of <net/if.h> on OpenBSD. + PR 61976. [David Carlier <devnexen gmail.com>, Yann Ylavic] + *) Fix apr_parse_addr_port() regression in scope_id parsing introduced in 1.6.3. [Rainer Jung] diff --git a/configure.in b/configure.in index 719f33141..56c016557 100644 --- a/configure.in +++ b/configure.in @@ -1162,7 +1162,15 @@ case $host in #endif";; esac -AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h]) +AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h \ + sys/shm.h sys/file.h sys/socket.h kernel/OS.h os2.h windows.h]) +AC_CHECK_HEADERS([net/if.h],[],[], +[ +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#include <net/if.h> +]) AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ create_area mprotect]) |