--- lib/tevent/libtevent.m4.~1~	Sun Mar  6 13:48:05 2011
+++ lib/tevent/libtevent.m4	Fri Jun  3 18:43:53 2011
@@ -5,10 +5,11 @@
 
 if test x"$teventdir" = "x"; then
 	teventdir=""
-	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
+	teventpaths=". ../lib/tevent tevent ../tevent"
 	for d in $teventpaths; do
-		if test -f "$d/tevent.c"; then
+		if test -f "$srcdir/$d/tevent.c"; then
 			teventdir="$d"
+			AC_SUBST(teventdir)
 			break;
 		fi
 	done
@@ -24,7 +25,7 @@
 AC_SUBST(TEVENT_CFLAGS)
 AC_SUBST(TEVENT_LIBS)
 
-TEVENT_CFLAGS="-I$teventdir"
+TEVENT_CFLAGS="-I$srcdir/$teventdir"
 
 TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
 TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"