aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-09-28 00:59:01 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-09-28 00:59:01 +0800
commit0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6 (patch)
treef08ca011d344dfc14632cae50134eb193b56022a
parente2b6ff7a6c1e1580c26ee0719b349151e8dad6fd (diff)
downloadgsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar.gz
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar.bz2
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar.lz
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar.xz
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.tar.zst
gsoc2013-evolution-0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6.zip
Adapt to camel-provider-1.2.pc going away.
-rw-r--r--configure.ac12
-rw-r--r--evolution-plugin.pc.in2
2 files changed, 5 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 0368b16f07..7c4c13feae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1196,14 +1196,10 @@ AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes])
dnl ******************************
dnl Camel Flags
dnl ******************************
-EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS)
+EVO_SET_COMPILE_FLAGS(CAMEL, camel-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS)
AC_SUBST(CAMEL_CFLAGS)
AC_SUBST(CAMEL_LIBS)
-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-1.2 libedataserver-1.2)
-AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
-AC_SUBST(CAMEL_GROUPWISE_LIBS)
-
if test "x$mozilla_nss" != "x"; then
EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)
MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss`
@@ -1232,7 +1228,7 @@ AC_SUBST(CERT_UI_LIBS)
dnl ************
dnl E_UTIL Flags
dnl ************
-EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
AC_SUBST(E_UTIL_CFLAGS)
AC_SUBST(E_UTIL_LIBS)
@@ -1255,7 +1251,7 @@ AC_SUBST(E_WIDGETS_LIBS)
dnl ***************
dnl IMPORTERS Flags
dnl ***************
-EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-provider-1.2 libebook-1.2)
+EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-1.2 libebook-1.2)
AC_SUBST(IMPORTERS_CFLAGS)
AC_SUBST(IMPORTERS_LIBS)
@@ -1336,7 +1332,7 @@ AC_MSG_RESULT([$ac_cv_have_iuth])
dnl **********
dnl Mail Flags
dnl **********
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)
diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in
index 2f7c48bee4..53603e0216 100644
--- a/evolution-plugin.pc.in
+++ b/evolution-plugin.pc.in
@@ -15,6 +15,6 @@ errordir=@privdatadir@/errors
Name: evolution-plugin
Description: libraries needed for Evolution plugin development
Version: @VERSION@
-Requires: camel-provider-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0
+Requires: camel-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0
Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
Cflags: -I${privincludedir}