From: Jelmer Vernooij Date: Thu, 26 Jun 2008 08:11:49 +0000 (+0200) Subject: Only try to detect the events lib dir if it wasn't set earlier. X-Git-Tag: samba-4.0.0alpha5~33^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f48f68800176d992a1bd9b6349f22ec152fc34a;p=thirdparty%2Fsamba.git 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 552dc7c43e0..d17da64b321 100644 --- 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"