[evolution-patches] [62021] gnome_segv2 not found by e-d-s

[Rodney Dawes <dobey novell com>]

This patch fixes 62021 by checking for the correct directory via
pkgconfig for the libgnomeui libexec programs. It also rips out
the check for it in the patch, since it is unneccesary with the
change to get the path from libgnomeui directly.

-- dobey


? calendar/libical/src/libicalss/icalssyacc.output
? calendar/libical/src/python/Makefile
? calendar/libical/src/python/Makefile.in
? libdb/dist/acinclude.m4
? libdb/dist/aclocal.m4
? libdb/dist/autom4te.cache
? po/notexist
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.56
diff -u -r1.56 configure.in
--- configure.in	19 Jul 2004 21:11:31 -0000	1.56
+++ configure.in	29 Jul 2004 15:43:55 -0000
@@ -165,6 +165,11 @@
 AC_MSG_RESULT($IDL_INCLUDES)
 AC_SUBST(IDL_INCLUDES)
 
+AC_MSG_CHECKING(for libgnomeui server directory)
+GNOMEUI_SERVERDIR="`$PKG_CONFIG --variable=libgnomeui_serverdir libgnomeui-2.0`"
+AC_MSG_RESULT($GNOMEUI_SERVERDIR)
+AC_DEFINE_UNQUOTED(GNOMEUI_SERVERDIR, "$GNOMEUI_SERVERDIR", [Path where we can find gnome_segv2])
+
 dnl Utility macro to set compiler flags for a specific lib.
 AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 	deps="$2"
Index: src/server.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/server.c,v
retrieving revision 1.18
diff -u -r1.18 server.c
--- src/server.c	8 Jul 2004 02:17:36 -0000	1.18
+++ src/server.c	29 Jul 2004 15:43:56 -0000
@@ -100,8 +100,7 @@
                 _exit (1);
         }
 	
-	if (!(gnome_segv_path = g_find_program_in_path ("gnome_segv2")))
-		gnome_segv_path = PREFIX "/libexec/gnome_segv2";
+	gnome_segv_path = GNOMEUI_SERVERDIR "/gnome_segv2";
 	
 	exec = g_strdup_printf ("%s \"" PACKAGE "\" %d \"" VERSION "\"", gnome_segv_path, signo);
 	system (exec);