Disable epoll as it has caused more obscure issues then any of my previous code. I will continue to work on it in a separate branch to make it stable for a release and test it against the following issues.
(closes issue #11253) Reported by: falves11 (closes issue #11657) Reported by: davevg (closes issue #11033) Reported by: falves11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
parent
1a6711a42d
commit
edad328409
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 103725 .
|
||||
# From configure.ac Revision: 103813 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
|
|
@ -16974,66 +16974,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||
fi
|
||||
|
||||
|
||||
if test "${cross_compiling}" = "no";
|
||||
then
|
||||
{ echo "$as_me:$LINENO: checking for working epoll support" >&5
|
||||
echo $ECHO_N "checking for working epoll support... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <sys/epoll.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int res = epoll_create(10);
|
||||
if (res < 0)
|
||||
return 1;
|
||||
close (res);
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; }
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_EPOLL 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
#if test "${cross_compiling}" = "no";
|
||||
#then
|
||||
#AC_MSG_CHECKING(for working epoll support)
|
||||
#AC_LINK_IFELSE(
|
||||
#AC_LANG_PROGRAM([#include <sys/epoll.h>], [int res = epoll_create(10);
|
||||
# if (res < 0)
|
||||
# return 1;
|
||||
# close (res);
|
||||
# return 0;]),
|
||||
#AC_MSG_RESULT(yes)
|
||||
#AC_DEFINE([HAVE_EPOLL], 1, [Define to 1 if your system has working epoll support.]),
|
||||
#AC_MSG_RESULT(no)
|
||||
#)
|
||||
#fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for compiler atomic operations" >&5
|
||||
echo $ECHO_N "checking for compiler atomic operations... $ECHO_C" >&6; }
|
||||
|
|
|
|||
28
configure.ac
28
configure.ac
|
|
@ -414,20 +414,20 @@ AC_MSG_RESULT(no)
|
|||
|
||||
AST_C_DEFINE_CHECK([PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [pthread.h])
|
||||
|
||||
if test "${cross_compiling}" = "no";
|
||||
then
|
||||
AC_MSG_CHECKING(for working epoll support)
|
||||
AC_LINK_IFELSE(
|
||||
AC_LANG_PROGRAM([#include <sys/epoll.h>], [int res = epoll_create(10);
|
||||
if (res < 0)
|
||||
return 1;
|
||||
close (res);
|
||||
return 0;]),
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE_EPOLL], 1, [Define to 1 if your system has working epoll support.]),
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
fi
|
||||
#if test "${cross_compiling}" = "no";
|
||||
#then
|
||||
#AC_MSG_CHECKING(for working epoll support)
|
||||
#AC_LINK_IFELSE(
|
||||
#AC_LANG_PROGRAM([#include <sys/epoll.h>], [int res = epoll_create(10);
|
||||
# if (res < 0)
|
||||
# return 1;
|
||||
# close (res);
|
||||
# return 0;]),
|
||||
#AC_MSG_RESULT(yes)
|
||||
#AC_DEFINE([HAVE_EPOLL], 1, [Define to 1 if your system has working epoll support.]),
|
||||
#AC_MSG_RESULT(no)
|
||||
#)
|
||||
#fi
|
||||
|
||||
AC_MSG_CHECKING(for compiler atomic operations)
|
||||
AC_LINK_IFELSE(
|
||||
|
|
|
|||
|
|
@ -186,9 +186,6 @@
|
|||
/* Define to 1 if you have the `endpwent' function. */
|
||||
#undef HAVE_ENDPWENT
|
||||
|
||||
/* Define to 1 if your system has working epoll support. */
|
||||
#undef HAVE_EPOLL
|
||||
|
||||
/* Define this to indicate the ${EXP_DESCRIP} library */
|
||||
#undef HAVE_EXP
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue