From: Rodney Dawes <dobey@novell.com>
Date: Thu, 29 Jul 2004 15:54:09 +0000 (+0000)
Subject: Check for libgnomeui_serverdir with pkgconfig, and AC_DEFINE it so we know
X-Git-Tag: upstream/3.7.4~8529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d8d11aa7424bfd8fb52d0a6d1b22afa5cab8b44;p=platform%2Fupstream%2Fevolution-data-server.git

Check for libgnomeui_serverdir with pkgconfig, and AC_DEFINE it so we know

2004-07-29  Rodney Dawes  <dobey@novell.com>

	* configure.in: Check for libgnomeui_serverdir with pkgconfig, and
	AC_DEFINE it so we know where to find gnome_segv2

	* src/server.c (gnome_segv_handler): Use GNOMEUI_SERVERDIR that we
	now define at configure time to find the path to gnome_segv2

	Fixes #62021
---

diff --git a/ChangeLog b/ChangeLog
index bbb360b..17bd0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-29  Rodney Dawes  <dobey@novell.com>
+
+	* configure.in: Check for libgnomeui_serverdir with pkgconfig, and
+	AC_DEFINE it so we know where to find gnome_segv2
+
+	* src/server.c (gnome_segv_handler): Use GNOMEUI_SERVERDIR that we
+	now define at configure time to find the path to gnome_segv2
+
+	Fixes #62021
+
 2004-07-19  JP Rosevear  <jpr@novell.com>
 
 	* configure.in: bump version, libtool numbers, soup requirement
diff --git a/configure.in b/configure.in
index b12a73e..3f3a9c7 100644
--- a/configure.in
+++ b/configure.in
@@ -165,6 +165,11 @@ IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config
 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"
diff --git a/src/server.c b/src/server.c
index d02ec4b..c1f9156 100644
--- a/src/server.c
+++ b/src/server.c
@@ -100,8 +100,7 @@ gnome_segv_handler (int signo)
                 _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);