Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1580
diff -u -p -r1.1580 ChangeLog
--- ChangeLog	27 Mar 2006 03:44:15 -0000	1.1580
+++ ChangeLog	1 Apr 2006 16:48:06 -0000
@@ -1,3 +1,10 @@
+2006-04-01  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* configure.in: Do not assume that only SunOS has pkill because
+	other systems (e.g. NetBSD) also have it.  Fix the check that
+	looks for an utility to kill a process by name to properly detect
+	either pkill or killall.  Fixes bug #336853.
+
 2006-03-27  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	* MAINTAINERS: Changing the maintainers file to reflect
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.891
diff -u -p -r1.891 configure.in
--- configure.in	22 Mar 2006 11:15:13 -0000	1.891
+++ configure.in	1 Apr 2006 16:48:07 -0000
@@ -975,20 +975,12 @@ dnl *****************
 dnl killall or pkill?
 dnl *****************
 
-AC_MSG_CHECKING(for command to kill processes)
-
-if test `uname -s` = "SunOS" ; then
-	KILL_PROCESS_CMD="pkill";
+AC_PATH_PROGS(KILL_PROCESS_CMD, killall pkill)
+if test -z "$KILL_PROCESS_CMD"; then
+	AC_MSG_WARN([Could not find a command to kill a process by name])
 else
-	KILL_PROCESS_CMD="killall";
-fi
-
-KILL_PROCESS_CMD=`which $KILL_PROCESS_CMD`
-if test -z "$KILL_PROCESS_CMD" ; then
-	AC_MSG_RESULT(none)
-else
-	AC_MSG_RESULT($KILL_PROCESS_CMD)
-	AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD", [Command to kill processes by name])
+	AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD",
+		[Command to kill processes by name])
 fi
 
 dnl ******************************
