[evolution-exchange] Adapt to camel-provider-1.2.pc going away.



commit 11a6b9a0d43bacd3e770b8efebf01ccc6d5bfbf4
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 27 13:00:03 2011 -0400

    Adapt to camel-provider-1.2.pc going away.

 configure.ac              |    4 ++--
 evolution-exchange-zip.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 17a828e..fc3e31d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,7 +156,7 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
 	libsoup-2.4 >= libsoup_minimum_version])
 
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
-	[camel-provider-1.2 >= eds_minimum_version
+	[camel-1.2 >= eds_minimum_version
 	libebook-1.2 >= eds_minimum_version
 	libecal-1.2 >= eds_minimum_version
 	libedataserver-1.2 >= eds_minimum_version
@@ -249,7 +249,7 @@ AC_SUBST(ecal_backenddir)
 EVOLUTION_imagesdir="`$PKG_CONFIG --variable=imagesdir evolution-shell-3.0`"
 AC_SUBST(EVOLUTION_imagesdir)
 
-CAMEL_providerdir="`$PKG_CONFIG --variable=camel_providerdir camel-provider-1.2`"
+CAMEL_providerdir="`$PKG_CONFIG --variable=camel_providerdir camel-1.2`"
 AC_SUBST(CAMEL_providerdir)
 
 dnl ***************************
diff --git a/evolution-exchange-zip.in b/evolution-exchange-zip.in
index 9347423..861bc25 100755
--- a/evolution-exchange-zip.in
+++ b/evolution-exchange-zip.in
@@ -17,7 +17,7 @@ libexec/evolution/@BASE_VERSION@/evolution-exchange-storage.exe
 bin/exchange-connector-setup- BASE_VERSION@.exe
 EOF
 
-cd `pkg-config --variable=prefix camel-provider- API_VERSION@`
+cd `pkg-config --variable=prefix camel- API_VERSION@`
 zip $ZIP -@ <<EOF
 lib/evolution-data-server- API_VERSION@/camel-providers/libcamelexchange.urls
 lib/evolution-data-server- API_VERSION@/camel-providers/libcamelexchange.dll



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