gmime r1483 - in trunk: . mono

[fejj svn gnome org]

Author: fejj
Date: Fri Oct  3 13:51:22 2008
New Revision: 1483
URL: http://svn.gnome.org/viewvc/gmime?rev=1483&view=rev

Log:
2008-10-02  Jeffrey Stedfast  <fejj novell com>

	Fixes for bug #554830

	* mono/Makefile.am: Don't hard-code the API version.

	* mono/gmime-sharp-2.4.pc.in: Fixed incorrect path to include the
	API_VERSION.

	* gmime-2.4.pc.in: Similar fixes.

	* configure.in: Define GMIME_API_VERSION



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/gmime-2.4.pc.in
   trunk/mono/Makefile.am
   trunk/mono/gmime-sharp-2.4.pc.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Oct  3 13:51:22 2008
@@ -21,20 +21,20 @@
 
 DISTCLEANFILES = iconv-detect.h
 
-EXTRA_DIST = 			\
-	PORTING			\
-	gmime-2.4.pc.in		\
-	gmime.spec.in 		\
-	iconv-detect.c		\
-	zentimer.h 		\
-	zenprofiler.h		\
+EXTRA_DIST = 				\
+	PORTING				\
+	gmime-$(GMIME_API_VERSION).pc.in\
+	gmime.spec.in 			\
+	iconv-detect.c			\
+	zentimer.h 			\
+	zenprofiler.h			\
 	gtk-doc.make
 
-BUILD_EXTRA_DIST = 		\
+BUILD_EXTRA_DIST = 			\
 	gmime.spec
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gmime-2.4.pc
+pkgconfig_DATA = gmime-$(GMIME_API_VERSION).pc
 
 $(pkgconfig_DATA): config.status
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct  3 13:51:22 2008
@@ -22,6 +22,10 @@
 AC_SUBST(GMIME_VERSION)
 AC_SUBST(GMIME_VERSION_INFO)
 
+dnl GMIME_API_VERSION does not necessarily reflect GMime's major.minor version
+GMIME_API_VERSION=2.4
+AC_SUBST(GMIME_API_VERSION)
+
 VERSION=$GMIME_VERSION
 
 AM_INIT_AUTOMAKE(gmime, $VERSION)

Modified: trunk/gmime-2.4.pc.in
==============================================================================
--- trunk/gmime-2.4.pc.in	(original)
+++ trunk/gmime-2.4.pc.in	Fri Oct  3 13:51:22 2008
@@ -9,4 +9,4 @@
 Description: MIME parser and utility library
 Requires: glib-2.0,gobject-2.0
 Libs: -L${libdir} @GMIME_LIBS@
-Cflags: -I${includedir}/gmime-2.4 @GMIME_CFLAGS@
+Cflags: -I${includedir}/gmime- GMIME_API_VERSION@ @GMIME_CFLAGS@

Modified: trunk/mono/Makefile.am
==============================================================================
--- trunk/mono/Makefile.am	(original)
+++ trunk/mono/Makefile.am	Fri Oct  3 13:51:22 2008
@@ -5,7 +5,7 @@
 references = $(GTK_SHARP_LIBS)
 SOURCES_XML = sources.xml
 
-PACKAGE_SHARP = $(PACKAGE)-sharp-2.4
+PACKAGE_SHARP = $(PACKAGE)-sharp-$(GMIME_API_VERSION)
 TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 noinst_DATA = $(API) $(ASSEMBLY) $(ASSEMBLY).config
@@ -13,7 +13,7 @@
 DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gmime-sharp-2.4.pc
+pkgconfig_DATA = $(PACKAGE_SHARP).pc
 
 sources = 				\
 	StreamWrapper.cs
@@ -53,7 +53,7 @@
 	$(customs)		\
 	$(sources)		\
 	$(SOURCES_XML)		\
-	gmime-sharp-2.4.pc.in
+	$(PACKAGE_SHARP).pc.in
 
 $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
 	cp $(srcdir)/$(RAW_API) $(API)

Modified: trunk/mono/gmime-sharp-2.4.pc.in
==============================================================================
--- trunk/mono/gmime-sharp-2.4.pc.in	(original)
+++ trunk/mono/gmime-sharp-2.4.pc.in	Fri Oct  3 13:51:22 2008
@@ -4,4 +4,4 @@
 Name: gmime-sharp 
 Version: @VERSION@
 Description: .NET bindings for GMime
-Libs: -r:${libdir}/mono/gmime-sharp/gmime-sharp.dll
+Libs: -r:${libdir}/mono/gmime-sharp- GMIME_API_VERSION@/gmime-sharp.dll