diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:35:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:35:16 +0200 |
| commit | 4911af47f8cd750f9b0f1374b447f171318de964 (patch) | |
| tree | a28fdd6e18a560b10fa52e40cec9b9f2709b46fe /source4/lib/events/libevents.m4 | |
| parent | d648c5849fba34b5691dcf1867ecd8f80fe35a6d (diff) | |
| parent | 250478d0445cf56e8b0b4e876977a9ae968ff55b (diff) | |
| download | samba-4911af47f8cd750f9b0f1374b447f171318de964.tar.gz samba-4911af47f8cd750f9b0f1374b447f171318de964.tar.bz2 samba-4911af47f8cd750f9b0f1374b447f171318de964.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 16dbbf75c7fa0f877659654a20bcab73b707e627)
Diffstat (limited to 'source4/lib/events/libevents.m4')
| -rw-r--r-- | source4/lib/events/libevents.m4 | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/source4/lib/events/libevents.m4 b/source4/lib/events/libevents.m4 index 99a47dcc54..483ab861fb 100644 --- a/source4/lib/events/libevents.m4 +++ b/source4/lib/events/libevents.m4 @@ -1,11 +1,28 @@ -EVENTS_OBJ="lib/events/events.o lib/events/events_select.o lib/events/events_signal.o lib/events/events_timed.o lib/events/events_standard.o" +dnl find the events sources. This is meant to work both for +dnl standalone builds, and builds of packages using libevents +eventsdir="" +eventspaths="$srcdir $srcdir/lib/events $srcdir/events $srcdir/../events" +for d in $eventspaths; do + if test -f "$d/events.c"; then + eventsdir="$d" + AC_SUBST(eventsdir) + break; + fi +done +if test x"$eventsdir" = "x"; then + AC_MSG_ERROR([cannot find libevents source in $eventspaths]) +fi + +EVENTS_OBJ="events.o events_select.o events_signal.o events_timed.o events_standard.o events_util.o" +AC_SUBST(LIBREPLACEOBJ) AC_CHECK_HEADERS(sys/epoll.h) AC_CHECK_FUNCS(epoll_create) if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then - EVENTS_OBJ="$EVENTS_OBJ lib/events/events_epoll.o" + EVENTS_OBJ="$EVENTS_OBJ events_epoll.o" AC_DEFINE(HAVE_EVENTS_EPOLL, 1, [Whether epoll available]) fi AC_SUBST(EVENTS_OBJ) + |