diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-26 10:11:49 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-26 10:11:49 +0200 |
| commit | 4f4949a8f4d729e189e873f8f5b0161e875d3501 (patch) | |
| tree | 1a187878a9e3dc6c87fb6b5712f9a4f4e991f2a0 | |
| parent | 9c6b7f760a17ef7fc55eac298e8778809ccc868e (diff) | |
| download | samba-4f4949a8f4d729e189e873f8f5b0161e875d3501.tar.gz samba-4f4949a8f4d729e189e873f8f5b0161e875d3501.tar.bz2 samba-4f4949a8f4d729e189e873f8f5b0161e875d3501.zip | |
Only try to detect the events lib dir if it wasn't set earlier.
(This used to be commit 3f48f68800176d992a1bd9b6349f22ec152fc34a)
| -rw-r--r-- | source4/lib/events/libevents.m4 | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source4/lib/events/libevents.m4 b/source4/lib/events/libevents.m4 index 552dc7c43e..d17da64b32 100644 --- a/source4/lib/events/libevents.m4 +++ b/source4/lib/events/libevents.m4 @@ -1,16 +1,18 @@ 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]) + eventsdir="" + eventspaths="$srcdir $srcdir/../samba4/source/lib/events $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 fi EVENTS_OBJ="events.o events_select.o events_signal.o events_timed.o events_standard.o events_debug.o events_util.o" |