GNOME.org
 

evolution-mapi r6 - in trunk: . po src/account-setup-eplugin src/addressbook src/calendar src/camel src/libexchangemapi

Author: msuman
Date: Wed Nov 19 11:19:27 2008
New Revision: 6
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=6&view=rev

Log:
Fix for build breaks, cleanup configure.in and make the compilation a lot safer by adding many of the required checks.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/po/ChangeLog
   trunk/po/Makefile.in.in
   trunk/src/account-setup-eplugin/ChangeLog
   trunk/src/account-setup-eplugin/Makefile.am
   trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
   trunk/src/addressbook/Makefile.am
   trunk/src/calendar/Makefile.am
   trunk/src/camel/Makefile.am
   trunk/src/libexchangemapi/ChangeLog
   trunk/src/libexchangemapi/Makefile.am
   trunk/src/libexchangemapi/libexchangemapi.pc.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov 19 11:19:27 2008
@@ -6,6 +6,16 @@
 AC_INIT(evolution-mapi, 0.1, http://go-evolution.org/MAPIProvider, evolution-mapi)
 AC_CONFIG_SRCDIR(README)
 
+# Some requirements have versioned package names
+# XXX In the spirit of getting rid of versioned
+#     files, can we please drop these suffixes?
+EDS_PACKAGE=1.2
+
+# Required Packages
+m4_define([eds_minimum_version], [2.24.0])
+m4_define([evo_minimum_version], [2.24.0])
+m4_define([libmapi_minimum_version], [0.8])
+
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_CONFIG_HEADER([config.h])
@@ -29,40 +39,44 @@
 
 PKG_PROG_PKG_CONFIG
 
+dnl ********************************
+dnl Check for evolution-data-server 
+dnl ********************************
+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER, evolution-data-server-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBEDATASERVER, libedataserver-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBEBACKEND, libebackend-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBECAL, libecal-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBEDATACAL, libedata-cal-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBBOOK, libebook-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(LIBEDATABOOK, libedata-book-$EDS_PACKAGE >= eds_minimum_version)
+PKG_CHECK_MODULES(CAMEL, camel-provider-$EDS_PACKAGE >= eds_minimum_version)
+
 dnl ****************************
 dnl Check for evolution plugins 
 dnl ****************************
+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin >= evo_minimum_version)
 
-AC_ARG_WITH(evolution, [  --evolution=[version] Use Evolution version.],
-			evolution_version="$withval", evolution_version="2.12")	
-
-AC_ARG_WITH(evolution-camelprovider, [  --evolution-camel=[version] Use Evolution Camel Provider version.],
-				   evolution_camel_version="$withval", evolution_camel_version="1.2" )
-
-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER, evolution-data-server-${evolution_camel_version})
-PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin)
-
-PKG_CHECK_MODULES(LIBEDATASERVER, libedataserver-${evolution_camel_version})
-PKG_CHECK_MODULES(LIBEBACKEND, libebackend-${evolution_camel_version})
-
-PKG_CHECK_MODULES(LIBECAL, libecal-${evolution_camel_version})
-PKG_CHECK_MODULES(LIBEDATACAL, libedata-cal-${evolution_camel_version})
-
-PKG_CHECK_MODULES(LIBBOOK, libebook-${evolution_camel_version})
-PKG_CHECK_MODULES(LIBEDATABOOK, libedata-book-${evolution_camel_version})
-
-PKG_CHECK_MODULES(CAMEL, camel-provider-${evolution_camel_version})
+dnl ****************************
+dnl Check for LibMAPI 
+dnl ****************************
+PKG_CHECK_MODULES(LIBMAPI, libmapi = libmapi_minimum_version)
 
-dnl TODO : Version check. 
-PKG_CHECK_MODULES(LIBMAPI, libmapi)
+dnl ***********
+dnl GConf stuff
+dnl ***********
 PKG_CHECK_MODULES(GCONF2, gconf-2.0)
-
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
-API_VERSION=${evolution_camel_version}
+API_VERSION=$EDS_PACKAGE
 AC_SUBST(API_VERSION)
 
+EDS_REQUIRED=eds_minimum_version
+AC_SUBST(EDS_REQUIRED)
+
+EVO_REQUIRED=evo_minimum_version
+AC_SUBST(EVO_REQUIRED)
+
 BASE_VERSION=`pkg-config --variable=execversion evolution-shell`
 AC_SUBST(BASE_VERSION)
 
@@ -113,35 +127,37 @@
 plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
 AC_SUBST(plugindir)
 
-camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-provider-${evolution_camel_version}`
+camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-provider-$EDS_PACKAGE`
 AC_SUBST(camel_providerdir)
 
-extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-${evolution_camel_version}`
+extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
 AC_SUBST(extensiondir)
 
-libmapi_ldif_dir=`$PKG_CONFIG --variable=libdir libmapi`/openchange/setup
+libmapi_ldif_dir=`$PKG_CONFIG --variable=datadir libmapi`/setup
 AC_SUBST(libmapi_ldif_dir)
 
-eds_privdatadir=`$PKG_CONFIG --variable=privdatadir evolution-data-server-${evolution_camel_version}`
+eds_privdatadir=`$PKG_CONFIG --variable=privdatadir evolution-data-server-$EDS_PACKAGE`
 AC_SUBST(eds_privdatadir)
 
-edataserver_privincludedir=`$PKG_CONFIG --variable=privincludedir libedataserver-${evolution_camel_version}`
+edataserver_privincludedir=`$PKG_CONFIG --variable=privincludedir libedataserver-$EDS_PACKAGE`
 AC_SUBST(edataserver_privincludedir)
 
 mapidatadir="$eds_privdatadir/mapi"
 AC_SUBST(mapidatadir)
 
+
 dnl ***********************
-dnl Makefiles 
+dnl CONFIG_FILES
 dnl ***********************
 
-AC_CONFIG_FILES([Makefile 
+AC_CONFIG_FILES([ po/Makefile.in
+Makefile 
 src/Makefile
 src/libexchangemapi/Makefile
+src/libexchangemapi/libexchangemapi.pc
 src/calendar/Makefile
 src/addressbook/Makefile
 src/camel/Makefile
 src/account-setup-eplugin/Makefile
-po/Makefile.in
 ])
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT

Modified: trunk/po/Makefile.in.in
==============================================================================
--- trunk/po/Makefile.in.in	(original)
+++ trunk/po/Makefile.in.in	Wed Nov 19 11:19:27 2008
@@ -56,7 +56,7 @@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 

Modified: trunk/src/account-setup-eplugin/Makefile.am
==============================================================================
--- trunk/src/account-setup-eplugin/Makefile.am	(original)
+++ trunk/src/account-setup-eplugin/Makefile.am	Wed Nov 19 11:19:27 2008
@@ -5,8 +5,8 @@
 	-I$(top_srcdir)/src/libexchangemapi/		\
 	$(CAMEL_CFLAGS)					\
 	$(EVOLUTION_PLUGIN_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS) \
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(EVOLUTION_CALENDAR_CFLAGS) 			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) 		\
 	$(LIBMAPI_CFLAGS)
 
 
@@ -23,17 +23,17 @@
 	exchange-mapi-account-listener.h
 
 liborg_gnome_exchange_mapi_la_LIBADD = 			\
-	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la	\
-	$(EVOLUTION_CALENDAR_LIBS) \
-	$(EVOLUTION_ADDRESSBOOK_LIBS) \
-	$(EVOLUTION_PLUGIN_LIBS)	\
-	$(CAMEL_LIBS) \
+	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la \
+	$(EVOLUTION_CALENDAR_LIBS) 			\
+	$(EVOLUTION_ADDRESSBOOK_LIBS) 			\
+	$(EVOLUTION_PLUGIN_LIBS)			\
+	$(CAMEL_LIBS) 					\
 	$(LIBMAPI_LIBS)
 
 liborg_gnome_exchange_mapi_la_LDFLAGS = -module -avoid-version -lmapi $(NO_UNDEFINED)
 liborg_gnome_exchange_mapi_la_CFLAGS = -I/usr/local/samba/include/
 
-EXTRA_DIST = 							\
+EXTRA_DIST = 						\
 	org-gnome-exchange-mapi.eplug.xml
 
 BUILT_SOURCES = org-gnome-exchange-mapi.eplug	

Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	(original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-listener.c	Wed Nov 19 11:19:27 2008
@@ -44,9 +44,9 @@
 /* FIXME: The mapi should not be needed in the include statement.
 LIMBAPI_CFLAGS or something is going wrong */
 
-#include <mapi/exchange-mapi-folder.h>
-#include <mapi/exchange-mapi-connection.h>
-#include <mapi/exchange-mapi-utils.h>
+#include <exchange-mapi-folder.h>
+#include <exchange-mapi-connection.h>
+#include <exchange-mapi-utils.h>
 
 #define d(x) x
 

Modified: trunk/src/addressbook/Makefile.am
==============================================================================
--- trunk/src/addressbook/Makefile.am	(original)
+++ trunk/src/addressbook/Makefile.am	Wed Nov 19 11:19:27 2008
@@ -1,35 +1,35 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"libebookbackend\"		\
-	-I$(top_srcdir)/src/addressbook			\
-	-I$(top_builddir)/src/addressbook		\
-	-I$(top_srcdir)/src/libexchangemapi		\
-	$(LIBMAPI_CFLAGS)				\
-	$(LIBEDATABOOK_CFLAGS)				\
-	$(LIBEDATASERVER_CFLAGS)			\
-	$(LIBEBACKEND_CFLAGS)				\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+INCLUDES =					\
+	-DG_LOG_DOMAIN=\"libebookbackend\"	\
+	-I$(top_srcdir)/src/addressbook		\
+	-I$(top_builddir)/src/addressbook	\
+	-I$(top_srcdir)/src/libexchangemapi	\
+	$(LIBMAPI_CFLAGS)			\
+	$(LIBEDATABOOK_CFLAGS)			\
+	$(LIBEDATASERVER_CFLAGS)		\
+	$(LIBEBACKEND_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 extension_LTLIBRARIES = libebookbackendmapi.la
 
-libebookbackendmapi_la_SOURCES =			\
-	e-book-backend-mapi.c				\
-	e-book-backend-mapi.h				\
+libebookbackendmapi_la_SOURCES =		\
+	e-book-backend-mapi.c			\
+	e-book-backend-mapi.h			\
 	e-book-backend-mapi-factory.c
 
-libebookbackendmapi_la_LIBADD =						\
-	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la		\
-	$(LIBEDATABOOK_LIBS)				\
+libebookbackendmapi_la_LIBADD =			\
+	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la \
+	$(LIBEDATABOOK_LIBS)			\
 	$(LIBEBACKEND_CFLAGS)			\
-	$(LIBEDATASERVER_LIBS)				\
-	$(EVOLUTION_DATA_SERVER_LIBS)			\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
+	$(LIBEDATASERVER_LIBS)			\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
 	$(LIBMAPI_LIBS)
 
-libebookbackendmapi_la_LDFLAGS =	\
+libebookbackendmapi_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
 
-#LDAP_SCHEMA =						\
+#LDAP_SCHEMA =			\
 #	evolutionperson.schema
 
 #ldapschemadir = $(privdatadir)

Modified: trunk/src/calendar/Makefile.am
==============================================================================
--- trunk/src/calendar/Makefile.am	(original)
+++ trunk/src/calendar/Makefile.am	Wed Nov 19 11:19:27 2008
@@ -2,8 +2,8 @@
 	-DG_LOG_DOMAIN=\"libecalbackendmapi\"	\
 	-I$(top_srcdir)/src/calendar		\
 	-I$(top_builddir)/src/calendar		\
-	-I$(top_srcdir)/src/libexchangemapi		\
-	-I$(top_builddir)/src/libexchangemapi		\
+	-I$(top_srcdir)/src/libexchangemapi	\
+	-I$(top_builddir)/src/libexchangemapi	\
 	$(LIBEBACKEND_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(LIBECAL_CFLAGS)			\
@@ -18,12 +18,12 @@
 	e-cal-backend-mapi.c			\
 	e-cal-backend-mapi.h
 
-libecalbackendmapi_la_LIBADD =					\
-	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la		\
-	$(LIBEBACKEND_LIBS)					\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(LIBECAL_LIBS)						\
-	$(LIBEDATACAL_LIBS)					\
+libecalbackendmapi_la_LIBADD =			\
+	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la \
+	$(LIBEBACKEND_LIBS)			\
+	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(LIBECAL_LIBS)				\
+	$(LIBEDATACAL_LIBS)			\
 	$(LIBMAPI_LIBS)
 
 libecalbackendmapi_la_LDFLAGS =			\

Modified: trunk/src/camel/Makefile.am
==============================================================================
--- trunk/src/camel/Makefile.am	(original)
+++ trunk/src/camel/Makefile.am	Wed Nov 19 11:19:27 2008
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelmapi.la
 camel_provider_DATA = libcamelmapi.urls
 
-INCLUDES = -I.. \
+INCLUDES = -I.. 				\
 	-I$(top_srcdir)/src/camel		\
 	-I$(top_srcdir)/src/libexchangemapi	\
 	$(CAMEL_CFLAGS)				\
@@ -27,9 +27,9 @@
 	camel-private.h				
 
 libcamelmapi_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
-libcamelmapi_la_LIBADD =                         \
-	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la		\
-	$(CAMEL_LIBS)                            \
+libcamelmapi_la_LIBADD = 			\
+	$(top_builddir)/src/libexchangemapi/libexchangemapi-1.0.la \
+	$(CAMEL_LIBS) 				\
         $(LIBMAPI_LIBS)
 
 EXTRA_DIST = libcamelmapi.urls

Modified: trunk/src/libexchangemapi/Makefile.am
==============================================================================
--- trunk/src/libexchangemapi/Makefile.am	(original)
+++ trunk/src/libexchangemapi/Makefile.am	Wed Nov 19 11:19:27 2008
@@ -1,9 +1,9 @@
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"libexchangemapi\"	\
 	-DMAPI_DATADIR=\""$(mapidatadir)"\"	\
+	-I$(top_srcdir)				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(LIBEDATASERVER_CFLAGS)		\
-	-I$(top_srcdir)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(LIBMAPI_CFLAGS)
 
@@ -31,10 +31,12 @@
 
 
 libexchangemapi_1_0_la_LIBADD =			\
-	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(EVOLUTION_CALENDAR_LIBS)		\
 	$(LIBMAPI_LIBS)
 
+libexchangemapi_1_0_la_LDFLAGS = $(NO_UNDEFINED)
+
 libexchangemapiincludedir = $(edataserver_privincludedir)/mapi
 
 libexchangemapiinclude_HEADERS = 		\
@@ -46,14 +48,14 @@
 	exchange-mapi-cal-tz-utils.h		\
 	exchange-mapi-cal-recur-utils.h
 
-%-1.0.pc: %.pc.in
+%-1.0.pc: %.pc
 	 cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libexchangemapi-1.0.pc
 
-EXTRA_DIST = 						\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) 	\
+EXTRA_DIST = 					\
+	$(pkgconfig_DATA:-1.0.pc=.pc.in) 	\
 	$(mapidata_DATA)
 
 DISTCLEANFILES = $(pkgconfig_DATA)

Modified: trunk/src/libexchangemapi/libexchangemapi.pc.in
==============================================================================
--- trunk/src/libexchangemapi/libexchangemapi.pc.in	(original)
+++ trunk/src/libexchangemapi/libexchangemapi.pc.in	Wed Nov 19 11:19:27 2008
@@ -5,14 +5,11 @@
 datarootdir= datarootdir@
 datadir= datadir@
 
-idldir= idldir@
-IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
-
-privincludedir= privincludedir@
+privincludedir= edataserver_privincludedir@
 
 Name: libexchangemapi
-Description: Client library for accessing Exchange with libmapi
+Description: Client library for accessing Exchange with LibMAPI
 Version: @VERSION@
-Requires: @LIBMAPI@
+Requires: evolution-data-server- API_VERSION@ >= @EDS_REQUIRED@ evolution-plugin >= @EVO_REQUIRED@ libmapi 
 Libs: -L${libdir} -lexchangemapi-1.0 -lmapi
 Cflags: -I${privincludedir}/mapi
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]