Only try to detect the events lib dir if it wasn't set earlier.

diff --git a/source/lib/events/libevents.m4 b/source/lib/events/libevents.m4
index 552dc7c43e087386569e6bd40234a3511a41a89a..d17da64b3213ff27fc6941e03a5b7781333fd1fa 100644 (file)
--- a/source/lib/events/libevents.m4
+++ b/source/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"