[evolution] Use the correct evolution-shell pkg-config file.



commit ffd26a2443ec593d9c3ec750136d83a10cf60009
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jun 29 14:03:21 2010 -0400

    Use the correct evolution-shell pkg-config file.
    
    evolution-mail-3.0 and evolution-calendar-3.0 should require
    evolution-shell-3.0.  evolution-mail and evolution-calendar should
    require evolution-shell.

 configure.ac             |    5 +++++
 evolution-calendar.pc.in |    2 +-
 evolution-mail.pc.in     |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fd8d0ae..a1bf337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,8 @@ if test "x${enable_gtk3}" = "xyes"; then
 	clutter_gtk_minimum_version="1.0"
 	gtkimageview_minimum_version="2.0"
 	gweather_minimum_version="2.90.0"
+
+	EVOLUTION_SHELL="evolution-shell-3.0"
 else
 	LIBEDATASERVERUI="libedataserverui-1.2"
 
@@ -118,6 +120,8 @@ else
 	gtkimageview_minimum_version="1.6"
 	gweather_minimum_version="2.25.3"
 	libnotify_minimum_version="0.3.0"
+
+	EVOLUTION_SHELL="evolution-shell"
 fi
 
 AC_SUBST(GTKHTML_EDITOR)
@@ -126,6 +130,7 @@ AC_SUBST(GTKHTML)
 AC_SUBST(UNIQUE)
 AC_SUBST(GNOME_DESKTOP)
 AC_SUBST(LIBEDATASERVERUI)
+AC_SUBST(EVOLUTION_SHELL)
 AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
 
 dnl ******************************
diff --git a/evolution-calendar.pc.in b/evolution-calendar.pc.in
index 756f97e..fdd852a 100644
--- a/evolution-calendar.pc.in
+++ b/evolution-calendar.pc.in
@@ -12,6 +12,6 @@ privincludedir= privincludedir@
 Name: Evolution Calendar
 Description: Calendar utilities for Evolution
 Version: @VERSION@
-Requires: evolution-shell
+Requires: @EVOLUTION_SHELL@
 Libs: -L${privlibdir} -levolution-calendar
 Cflags: -I${privincludedir}
diff --git a/evolution-mail.pc.in b/evolution-mail.pc.in
index 3d52f92..3406886 100644
--- a/evolution-mail.pc.in
+++ b/evolution-mail.pc.in
@@ -12,6 +12,6 @@ privincludedir= privincludedir@
 Name: Evolution Mail
 Description: Mail utilities for Evolution
 Version: @VERSION@
-Requires: evolution-shell camel-1.2
+Requires: @EVOLUTION_SHELL@ camel-1.2
 Libs: -L${privlibdir} -levolution-mail -lcomposer
 Cflags: -I${privincludedir}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]