[asterisk-commits] russell: branch russell/events r81885 - /team/russell/events/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Sep  7 08:59:37 2007
New Revision: 81885

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81885
Log:
resolve conflict, reset automerge

Modified:
    team/russell/events/   (props changed)
    team/russell/events/configure
    team/russell/events/configure.ac

Propchange: team/russell/events/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  7 08:59:37 2007
@@ -1,1 +1,1 @@
-/trunk:1-81869
+/trunk:1-81884

Modified: team/russell/events/configure
URL: http://svn.digium.com/view/asterisk/team/russell/events/configure?view=diff&rev=81885&r1=81884&r2=81885
==============================================================================
--- team/russell/events/configure (original)
+++ team/russell/events/configure Fri Sep  7 08:59:37 2007
@@ -15690,6 +15690,8 @@
     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
@@ -15747,6 +15749,7 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
+fi
 
 { echo "$as_me:$LINENO: checking for compiler atomic operations" >&5
 echo $ECHO_N "checking for compiler atomic operations... $ECHO_C" >&6; }

Modified: team/russell/events/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/events/configure.ac?view=diff&rev=81885&r1=81884&r2=81885
==============================================================================
--- team/russell/events/configure.ac (original)
+++ team/russell/events/configure.ac Fri Sep  7 08:59:37 2007
@@ -334,6 +334,8 @@
 AST_C_DEFINE_CHECK([PTHREAD_RWLOCK_INITIALIZER], [PTHREAD_RWLOCK_INITIALIZER], [pthread.h])
 AST_C_DEFINE_CHECK([PTHREAD_RWLOCK_PREFER_WRITER_NP], [PTHREAD_RWLOCK_PREFER_WRITER_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);
@@ -345,6 +347,7 @@
 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(