sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ioqueue backend selection configure script (#3878)

This commit is contained in:
sauwming 2024-03-06 13:27:37 +08:00 committed by GitHub
parent 7d2248f38a
commit c36802585d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
aconfigure
View File

@ -6518,19 +6518,26 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
printf %s "checking ioqueue backend... " >&6; } printf %s "checking ioqueue backend... " >&6; }
ac_os_objs=ioqueue_select.o
ac_linux_poll=select
case $target in case $target in
*darwin* | *bsd*) *darwin* | *bsd*)
# Check whether --enable-kqueue was given. # Check whether --enable-kqueue was given.
if test ${enable_kqueue+y} if test ${enable_kqueue+y}
then : then :
enableval=$enable_kqueue; enableval=$enable_kqueue;
ac_os_objs=ioqueue_kqueue.o if test "$enable_kqueue" = "yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: kqueue()" >&5 ac_os_objs=ioqueue_kqueue.o
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: kqueue()" >&5
printf "%s\n" "kqueue()" >&6; } printf "%s\n" "kqueue()" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
printf "%s\n" "select()" >&6; }
fi
else $as_nop else $as_nop
ac_os_objs=ioqueue_select.o
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
printf "%s\n" "select()" >&6; } printf "%s\n" "select()" >&6; }
@ -6542,19 +6549,22 @@ fi
if test ${enable_epoll+y} if test ${enable_epoll+y}
then : then :
enableval=$enable_epoll; enableval=$enable_epoll;
ac_os_objs=ioqueue_epoll.o if test "$enable_epoll" = "yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5 ac_os_objs=ioqueue_epoll.o
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
printf "%s\n" "/dev/epoll" >&6; } printf "%s\n" "/dev/epoll" >&6; }
printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
ac_linux_poll=epoll ac_linux_poll=epoll
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
printf "%s\n" "select()" >&6; }
fi
else $as_nop else $as_nop
ac_os_objs=ioqueue_select.o
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
printf "%s\n" "select()" >&6; } printf "%s\n" "select()" >&6; }
ac_linux_poll=select
fi fi

26
aconfigure.ac
View File

@ -467,17 +467,23 @@ AC_SUBST(ac_os_objs)
AC_SUBST(ac_linux_poll) AC_SUBST(ac_linux_poll)
AC_MSG_CHECKING([ioqueue backend]) AC_MSG_CHECKING([ioqueue backend])
ac_os_objs=ioqueue_select.o
ac_linux_poll=select
case $target in case $target in
*darwin* | *bsd*) *darwin* | *bsd*)
AC_ARG_ENABLE(kqueue, AC_ARG_ENABLE(kqueue,
AS_HELP_STRING([--enable-kqueue], AS_HELP_STRING([--enable-kqueue],
[Use kqueue ioqueue on macos/BSD (experimental)]), [Use kqueue ioqueue on macos/BSD (experimental)]),
[ [
ac_os_objs=ioqueue_kqueue.o if test "$enable_kqueue" = "yes"; then
AC_MSG_RESULT([kqueue()]) ac_os_objs=ioqueue_kqueue.o
AC_MSG_RESULT([kqueue()])
else
AC_MSG_RESULT([select()])
fi
], ],
[ [
ac_os_objs=ioqueue_select.o
AC_MSG_RESULT([select()]) AC_MSG_RESULT([select()])
]) ])
;; ;;
@ -486,15 +492,17 @@ case $target in
AS_HELP_STRING([--enable-epoll], AS_HELP_STRING([--enable-epoll],
[Use /dev/epoll ioqueue on Linux (experimental)]), [Use /dev/epoll ioqueue on Linux (experimental)]),
[ [
ac_os_objs=ioqueue_epoll.o if test "$enable_epoll" = "yes"; then
AC_MSG_RESULT([/dev/epoll]) ac_os_objs=ioqueue_epoll.o
AC_DEFINE(PJ_HAS_LINUX_EPOLL,1) AC_MSG_RESULT([/dev/epoll])
ac_linux_poll=epoll AC_DEFINE(PJ_HAS_LINUX_EPOLL,1)
ac_linux_poll=epoll
else
AC_MSG_RESULT([select()])
fi
], ],
[ [
ac_os_objs=ioqueue_select.o
AC_MSG_RESULT([select()]) AC_MSG_RESULT([select()])
ac_linux_poll=select
]) ])
;; ;;
esac esac