Hey,

I noticed that the killall/pkill-based solution for killev has been
rewritten and doesn't use killall anymore, therefore I took the liberty
to get rid of it's detection in configure.ac and also removed
corresponding IFDEF in code.

It would be nice if someone could check whether WIN32 still compiles..
From 18ff2b2adb08150cde2309efec6c5aaa96cb6387 Mon Sep 17 00:00:00 2001
From: Priit Laes <pl...@plaes.org>
Date: Fri, 26 Feb 2010 12:46:27 +0200
Subject: [PATCH] Remove unused KILL_PROCESS_CMD stuff.

---
 configure.ac |   19 -------------------
 shell/main.c |    2 --
 2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2b93435..1b51462 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1042,25 +1042,6 @@ AC_SUBST(MANUAL_NSPR_LIBS)
 AC_SUBST(MANUAL_NSS_CFLAGS)
 AC_SUBST(MANUAL_NSS_LIBS)
 
-dnl *****************
-dnl killall or pkill?
-dnl *****************
-
-case "$host" in
-*solaris*)
-	KILL_PROCESS_CMD="/usr/bin/pkill -x"
-	;;
-*)
-	AC_PATH_PROGS(KILL_PROCESS_CMD, killall pkill)
-	;;
-esac
-if test -z "$KILL_PROCESS_CMD"; then
-	AC_MSG_WARN([Could not find a command to kill a process by name])
-else
-	AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD",
-		[Command to kill processes by name])
-fi
-
 dnl *******************
 dnl GObject marshalling
 dnl *******************
diff --git a/shell/main.c b/shell/main.c
index 72e9aed..2c326f2 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -322,10 +322,8 @@ static GOptionEntry entries[] = {
 	  N_("Start in offline mode"), NULL },
 	{ "online", '\0', 0, G_OPTION_ARG_NONE, &start_online,
 	  N_("Start in online mode"), NULL },
-#ifdef KILL_PROCESS_CMD
 	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &force_shutdown,
 	  N_("Forcibly shut down Evolution"), NULL },
-#endif
 #ifdef DEVELOPMENT
 	{ "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate,
 	  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
-- 
1.7.0

_______________________________________________
Evolution-hackers mailing list
Evolution-hackers@gnome.org
http://mail.gnome.org/mailman/listinfo/evolution-hackers

Reply via email to