[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-116-g3f48f68

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  3f48f68800176d992a1bd9b6349f22ec152fc34a (commit)
      from  78760606fa71c370ae3c05b077c5146166bdaa7b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 3f48f68800176d992a1bd9b6349f22ec152fc34a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 26 10:11:49 2008 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events/libevents.m4 |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events/libevents.m4 b/source/lib/events/libevents.m4
index 552dc7c..d17da64 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"


-- 
Samba Shared Repository