Adattamento a evolution-data-server 3.4.

diff --git a/configure.ac b/configure.ac
index 980eaab4ab96ecc8bf00bdc1c32c09e991c37b31..ac17bc20f16d0ead5b9c4c6efff97ee4cabb8c12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,18 +40,30 @@ PKG_CHECK_MODULES(SOLIPA, [gobject-2.0 >= 2.24.0
 AC_SUBST(SOLIPA_CFLAGS)
 AC_SUBST(SOLIPA_LIBS)
 
-PKG_CHECK_MODULES(CAMEL, camel-provider-1.2 >= 3, [camel3_found=yes], [camel3_found=no])
-
-if test x$camel3_found = xno; then
-       PKG_CHECK_MODULES(CAMEL, camel-provider-1.2 >= 2.32)
+PKG_CHECK_MODULES(CAMEL, camel-1.2 >= 3.4, [camel34_found=yes], [camel34_found=no])
+
+camel3_found=no
+if test x$camel34_found = xno; then
+       PKG_CHECK_MODULES(CAMEL, camel-provider-1.2 >= 3, [camel3_found=yes], [camel3_found=no])
+
+       if test x$camel3_found = xno; then
+               PKG_CHECK_MODULES(CAMEL, camel-provider-1.2 >= 2.32)
+       fi
+       CAMEL_PKGCONFIG="camel-provider-1.2"
+else
+       CAMEL_PKGCONFIG="camel-1.2"
 fi
 
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
+AC_SUBST(CAMEL34_FOUND)
+AM_CONDITIONAL(HAVE_CAMEL34, test $camel34_found = yes)
 AC_SUBST(CAMEL3_FOUND)
 AM_CONDITIONAL(HAVE_CAMEL3, test $camel3_found = yes)
 
+AC_SUBST(CAMEL_PKGCONFIG)
+
 AC_CHECK_PROG(PYTHON_CFLAGS, [python-config], `python-config --cflags`, [-I/c/Python26/include])
 AC_CHECK_PROG(PYTHON_LIBS, [python-config], `python-config --libs`, [-lpthread -lm -L/c/Python26/libs -lpython26])
 AC_SUBST(PYTHON_CFLAGS)

diff --git a/libsolipa.pc.in b/libsolipa.pc.in
index f7b58d0a0f650a57208ce7ddfd55e7877f2778bc..ad73205365a2ed1262ae93f41782c72b0d0edb57 100644 (file)
--- a/libsolipa.pc.in
+++ b/libsolipa.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Classe con funzioni varie di utilità.
 Version: @PACKAGE_VERSION@
-Requires: glib-2.0 gobject-2.0 libgdaex camel-provider-1.2 gtk+-2.0 libgtkform gio-2.0
+Requires: glib-2.0 gobject-2.0 libgdaex @CAMEL_PKGCONFIG@ gtk+-2.0 libgtkform gio-2.0
 Libs: -L${libdir} -lsolipa
 Cflags: -I${includedir}

diff --git a/src/Makefile.am b/src/Makefile.am
index eb9fa53ccf1fc616d4b67d089122544621c8f719..14023d42c8fe656975a6515cd42397921d49c49e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,10 +10,14 @@ LIBS = $(SOLIPA_LIBS) \
        $(CAMEL_LIBS) \
        $(WIN32_LIBS)
 
+if HAVE_CAMEL34
+CAMEL3=-DCAMEL3=\"yes\"
+else
 if HAVE_CAMEL3
-CAMEL3 = -DCAMEL3=\"yes\"
+CAMEL3=-DCAMEL3=\"yes\"
 else
-CAMEL3 =
+CAMEL3=
+endif
 endif
 
 AM_CPPFLAGS = $(SOLIPA_CFLAGS) \