[evolution] Return RPATH linker flags back to evolution-shell.pc.in

[Milan Crha <mcrha src gnome org>]

commit ea77fcd9ba4b93e49cbf9a9ad543cdf753a7cada
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 9 15:38:56 2016 +0100

    Return RPATH linker flags back to evolution-shell.pc.in
    
    It's required for consumers of the private evolution libraries, whom do not
    link into the same folder or which use those libraries in other than the evolution
    only (like evolution-activesync).

 CMakeLists.txt        |    6 ++++++
 evolution-shell.pc.in |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64bfbd9..18383bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -673,6 +673,12 @@ else(ENABLE_GNOME_DESKTOP)
        set(shell_private_requirements "")
 endif(ENABLE_GNOME_DESKTOP)
 
+# The shell_privlibdir_rpath_flags is used by the evolution-shell.pc.in
+# and if set, then should be preceded with a space.
+if(NOT WIN32)
+       set(shell_privlibdir_rpath_flags  " -Wl,-R${privlibdir}")
+endif(NOT WIN32)
+
 add_pkgconfig_file(evolution-calendar.pc.in evolution-calendar-${INTERFACE_VERSION}.pc)
 add_pkgconfig_file(evolution-mail.pc.in evolution-mail-${INTERFACE_VERSION}.pc)
 add_pkgconfig_file(evolution-shell.pc.in evolution-shell-${INTERFACE_VERSION}.pc)
diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in
index 30a7f40..04a252d 100644
--- a/evolution-shell.pc.in
+++ b/evolution-shell.pc.in
@@ -19,5 +19,5 @@ Description: libraries needed for Evolution shell components
 Version: @PROJECT_VERSION@
 Requires: gtk+-3.0 libebackend-1.2 libedataserver-1.2 libedataserverui-1.2 webkit2gtk-4.0
 @shell_private_requirements@
-Libs: -L${privlibdir} -levolution-shell -levolution-util
+Libs: -L${privlibdir} -levolution-shell -levolution-util@shell_privlibdir_rpath_flags@
 Cflags: -I${privincludedir}