aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-14 12:19:50 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-14 12:19:50 +0800
commit1c4ed07afe332e6b95d7578323f23086831f917b (patch)
treec158026dd7ecb583e6a98578ef3cdd9a84371b59
parent83ba9a2ff8531d3af7d60d98d530522b2ca7f3a0 (diff)
downloadgsoc2013-evolution-1c4ed07afe332e6b95d7578323f23086831f917b.tar.gz
gsoc2013-evolution-1c4ed07afe332e6b95d7578323f23086831f917b.tar.zst
gsoc2013-evolution-1c4ed07afe332e6b95d7578323f23086831f917b.zip
** Fix for bug #380750
svn path=/trunk/; revision=33535
-rw-r--r--ChangeLog6
-rw-r--r--configure.in9
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4216958c9d..a07e7b00da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
2007-05-08 Wang Xin <jedy.wang@sun.com>
+ ** Fix for bug #380750
+
+ * configure.in: Make force-shutdown work in Solaris
+
+2007-05-08 Wang Xin <jedy.wang@sun.com>
+
* configure.in: Fixes 394579:incompatible awk on Solaris cause
evolution can not recognize the dbus whose version is newer than
1.0.0.
diff --git a/configure.in b/configure.in
index aa9ac8db41..479611a2de 100644
--- a/configure.in
+++ b/configure.in
@@ -1052,7 +1052,14 @@ dnl *****************
dnl killall or pkill?
dnl *****************
-AC_PATH_PROGS(KILL_PROCESS_CMD, killall pkill)
+case "$host" in
+*solaris*)
+ AC_PATH_PROGS(KILL_PROCESS_CMD, pkill)
+ ;;
+*)
+ 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