diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-30 02:03:21 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-30 02:03:21 +0800 |
| commit | ffd26a2443ec593d9c3ec750136d83a10cf60009 (patch) | |
| tree | 27d88211424f5f5ab0608dc7fb3fafa05225e4c2 | |
| parent | 83abb5845e4cc92e3f9a980677c91321f08ec367 (diff) | |
| download | gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar.gz gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar.bz2 gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar.lz gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar.xz gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.tar.zst gsoc2013-evolution-ffd26a2443ec593d9c3ec750136d83a10cf60009.zip | |
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.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | evolution-calendar.pc.in | 2 | ||||
| -rw-r--r-- | evolution-mail.pc.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index fd8d0aebfc..a1bf33759a 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 756f97e0a0..fdd852a678 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 3d52f922e1..340688632c 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} |