summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-09-07 12:32:04 +0000
committerJoshua Colp <jcolp@digium.com>2007-09-07 12:32:04 +0000
commit2190931e37aed9041bb5af4a0582d76a07b0b5ac (patch)
tree51ffe21be6d1be69a96cb1f787ee3f629e15fbc3
parenta565584d052359ce9058d2fbea833ebfb807b18e (diff)
Don't check for epoll support when cross compiling.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81873 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac3
2 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 5c668a1c9..93f9d45a9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 78683 .
+# From configure.ac Revision: 79972 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -15624,6 +15624,8 @@ 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
@@ -15681,6 +15683,7 @@ fi
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; }
diff --git a/configure.ac b/configure.ac
index a1862937b..cdfe2021b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,6 +332,8 @@ fi
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);
@@ -343,6 +345,7 @@ 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(