You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2018/03/22 22:46:30 UTC
svn commit: r1827534 - /apr/apr/trunk/configure.in
Author: ylavic
Date: Thu Mar 22 22:46:30 2018
New Revision: 1827534
URL: http://svn.apache.org/viewvc?rev=1827534&view=rev
Log:
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
Modified:
apr/apr/trunk/configure.in
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1827534&r1=1827533&r2=1827534&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Thu Mar 22 22:46:30 2018
@@ -1070,8 +1070,14 @@ case $host in
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 \
- net/if.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])
Re: svn commit: r1827534 - /apr/apr/trunk/configure.in
Posted by Yann Ylavic <yl...@gmail.com>.
On Tue, Apr 3, 2018 at 7:17 PM, Yann Ylavic <yl...@gmail.com> wrote:
> On Tue, Apr 3, 2018 at 5:58 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
>> Yann,
>>
>> Did you mean to hold off on any backport to 1.7/1.6?
>
> Oh, not really, will do, thanks for the reminder!
r1828282/r1828284 (resp. for 1.7/1.6).
Thanks,
Yann.
Re: svn commit: r1827534 - /apr/apr/trunk/configure.in
Posted by Yann Ylavic <yl...@gmail.com>.
On Tue, Apr 3, 2018 at 5:58 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
> Yann,
>
> Did you mean to hold off on any backport to 1.7/1.6?
Oh, not really, will do, thanks for the reminder!
Re: svn commit: r1827534 - /apr/apr/trunk/configure.in
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
Yann,
Did you mean to hold off on any backport to 1.7/1.6?
On Thu, Mar 22, 2018 at 5:46 PM, <yl...@apache.org> wrote:
> Author: ylavic
> Date: Thu Mar 22 22:46:30 2018
> New Revision: 1827534
>
> URL: http://svn.apache.org/viewvc?rev=1827534&view=rev
> Log:
> 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
>
> Modified:
> apr/apr/trunk/configure.in
>
> Modified: apr/apr/trunk/configure.in
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1827534&r1=1827533&r2=1827534&view=diff
> ==============================================================================
> --- apr/apr/trunk/configure.in (original)
> +++ apr/apr/trunk/configure.in Thu Mar 22 22:46:30 2018
> @@ -1070,8 +1070,14 @@ case $host in
> 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 \
> - net/if.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])
>
>
>