evolution-mapi r99 - in trunk: . src/libexchangemapi

[mcrha svn gnome org]

Author: mcrha
Date: Wed Feb  4 10:55:28 2009
New Revision: 99
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=99&view=rev

Log:
2009-02-04  Milan Crha  <mcrha redhat com>

	** Fix for bug #569482

	* configure.in: Renamed to configure.ac.
	* autogen.sh: Check for configure.ac.
	* configure.ac: Added EVO_MAPI_API_VERSION_MACRO and
	EVO_MAPI_API_VERSION variable. Copying libexchangemapi.pc.in
	to libexchangemapi-1.0.pc directly.

	* src/libexchangemapi/Makefile.am: Removed obsolete lines and use
	EVO_MAPI_API_VERSION variable.



Added:
   trunk/configure.ac   (contents, props changed)
      - copied, changed from r98, /trunk/configure.in
Removed:
   trunk/configure.in
Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/src/libexchangemapi/ChangeLog
   trunk/src/libexchangemapi/Makefile.am

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Feb  4 10:55:28 2009
@@ -7,7 +7,7 @@
 PKG_NAME="evolution-mapi"
 REQUIRED_AUTOMAKE_VERSION=1.6
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -f $srcdir/ChangeLog \
   && test -d $srcdir/src/account-setup-eplugin) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"

Copied: trunk/configure.ac (from r98, /trunk/configure.in)
==============================================================================
--- /trunk/configure.in	(original)
+++ trunk/configure.ac	Wed Feb  4 10:55:28 2009
@@ -22,6 +22,13 @@
 AC_CONFIG_HEADER(config.h)
 
 dnl ****************************
+dnl Evolution-MAPI API version
+dnl ****************************
+m4_define([EVO_MAPI_API_VERSION_MACRO], [1.0])
+EVO_MAPI_API_VERSION=EVO_MAPI_API_VERSION_MACRO
+AC_SUBST(EVO_MAPI_API_VERSION)
+
+dnl ****************************
 dnl Initialize maintainer mode
 dnl ****************************
 AM_MAINTAINER_MODE
@@ -138,6 +145,6 @@
 src/calendar/Makefile
 src/camel/Makefile
 src/libexchangemapi/Makefile
-src/libexchangemapi/libexchangemapi.pc
+src/libexchangemapi/libexchangemapi-]EVO_MAPI_API_VERSION_MACRO[.pc:src/libexchangemapi/libexchangemapi.pc.in
 po/Makefile.in
 ])

Modified: trunk/src/libexchangemapi/Makefile.am
==============================================================================
--- trunk/src/libexchangemapi/Makefile.am	(original)
+++ trunk/src/libexchangemapi/Makefile.am	Wed Feb  4 10:55:28 2009
@@ -50,15 +50,9 @@
 	exchange-mapi-cal-tz-utils.h		\
 	exchange-mapi-cal-recur-utils.h
 
-%-1.0.pc: %.pc
-	 cp $< $@
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libexchangemapi-1.0.pc
+pkgconfig_DATA = libexchangemapi-$(EVO_MAPI_API_VERSION).pc
 
 EXTRA_DIST = 					\
-	$(pkgconfig_DATA:-1.0.pc=.pc.in) 	\
 	$(mapidata_DATA)
 
-DISTCLEANFILES = $(pkgconfig_DATA)
-