aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-03-29 07:39:25 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-03-29 07:39:25 +0800
commit325edf034ca4407a135b2a4eba12c2bae338d0d6 (patch)
tree9fd062c64e896989163d62e2fc9ec666667af087
parent39f523bc89d29157978690008b5d8738406bf8f8 (diff)
downloadgsoc2013-evolution-325edf034ca4407a135b2a4eba12c2bae338d0d6.tar.gz
gsoc2013-evolution-325edf034ca4407a135b2a4eba12c2bae338d0d6.tar.zst
gsoc2013-evolution-325edf034ca4407a135b2a4eba12c2bae338d0d6.zip
Ported check for "killall" vs. "killp" back from
1.2. svn path=/trunk/; revision=20571
-rw-r--r--ChangeLog8
-rw-r--r--configure.in22
2 files changed, 27 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 936ec051bc..95bd8d734f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
2003-03-28 Ettore Perazzoli <ettore@ximian.com>
- * data/Makefile.am (install-data-local): Fix installation of the
- .desktop file.
+ * configure.in: Ported check for "killall" vs. "killp" back from
+ 1.2.
+
+2003-03-28 Ettore Perazzoli <ettore@ximian.com>
+
+ * data/Makefile.am: Fix installation of the .desktop file.
2003-03-27 Ettore Perazzoli <ettore@ximian.com>
diff --git a/configure.in b/configure.in
index 4740cb6f45..8766b12bde 100644
--- a/configure.in
+++ b/configure.in
@@ -927,6 +927,26 @@ AC_MSG_RESULT([$DTAPPINTEGRATE])
AC_SUBST(DTAPPINTEGRATE)
AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, test "x$DTAPPINTEGRATE" != "xno")
+dnl *****************
+dnl killall or pkill?
+dnl *****************
+
+AC_MSG_CHECKING(for command to kill processes)
+
+if test `uname -s` = "SunOS" ; then
+ KILL_PROCESS_CMD="pkill";
+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])
+fi
+
dnl ****************************************************
dnl GNOME_PREFIX is is needed by shell/evolution-nognome
dnl ****************************************************
@@ -1118,7 +1138,7 @@ AC_SUBST(EVOLUTION_MAIL_LIBS)
dnl -- wombat flags
-EVO_SET_COMPILE_FLAGS(WOMBAT, libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS)
+EVO_SET_COMPILE_FLAGS(WOMBAT, gal-2.0 libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS)
AC_SUBST(WOMBAT_CFLAGS)
AC_SUBST(WOMBAT_LIBS)