[gmime/gmime-2-4] Depend on glib-sharp instead of gtk-sharp
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime/gmime-2-4] Depend on glib-sharp instead of gtk-sharp
- Date: Mon, 14 Mar 2011 21:03:56 +0000 (UTC)
commit b526b05cc9c12edbaab9f567ebc3e30d547358a0
Author: Jeffrey Stedfast <fejj gnome org>
Date: Mon Mar 14 17:03:25 2011 -0400
Depend on glib-sharp instead of gtk-sharp
2011-03-14 Jeffrey Stedfast <fejj novell com>
* configure.in: Check for glib-sharp-2.0 instead of gtk-sharp-2.0
since we really only depend on glib-sharp. Also check for gapi-2.0
via pkgconfig.
* mono/gmime-sharp.dll.config.in: Dll map the .so.MajorVersion
instead of .so.Version.
ChangeLog | 9 +++++++++
configure.in | 5 +++--
mono/Makefile.am | 2 +-
mono/gmime-sharp.dll.config.in | 2 +-
4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 887d080..b82ce67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-14 Jeffrey Stedfast <fejj novell com>
+
+ * configure.in: Check for glib-sharp-2.0 instead of gtk-sharp-2.0
+ since we really only depend on glib-sharp. Also check for gapi-2.0
+ via pkgconfig.
+
+ * mono/gmime-sharp.dll.config.in: Dll map the .so.MajorVersion
+ instead of .so.Version.
+
2011-03-07 Jeffrey Stedfast <fejj novell com>
* README: Bumped version
diff --git a/configure.in b/configure.in
index ea4ca7d..9169e79 100644
--- a/configure.in
+++ b/configure.in
@@ -460,9 +460,10 @@ if test "x$enable_mono" = "xyes"; then
AC_SUBST(CSC)
AC_SUBST(GACUTIL)
- PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.4.0)
- AC_SUBST(GTK_SHARP_LIBS)
+ PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0 >= 2.4.0)
+ AC_SUBST(GLIB_SHARP_LIBS)
+ PKG_CHECK_MODULES(GAPI_TOOLS, gapi-2.0)
AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
if test "x$GAPI_CODEGEN" = "xno"; then
AC_MSG_ERROR([You need to install gtk-sharp2-gapi])
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 65af0c0..f76127c 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -2,7 +2,7 @@ API = gmime-api.xml
RAW_API = gmime-api.raw
METADATA = GMime.metadata
ASSEMBLY_NAME = gmime-sharp
-references = $(GTK_SHARP_LIBS)
+references = $(GLIB_SHARP_LIBS)
SOURCES_XML = sources.xml
PACKAGE_SHARP = $(PACKAGE)-sharp-$(GMIME_API_VERSION)
diff --git a/mono/gmime-sharp.dll.config.in b/mono/gmime-sharp.dll.config.in
index d3d373e..56f0188 100644
--- a/mono/gmime-sharp.dll.config.in
+++ b/mono/gmime-sharp.dll.config.in
@@ -1,3 +1,3 @@
<configuration>
- <dllmap dll="gmime" target="libgmime- GMIME_API_VERSION@ so GMIME_VERSION@"/>
+ <dllmap dll="gmime" target="libgmime- GMIME_API_VERSION@ so GMIME_MAJOR_VERSION@"/>
</configuration>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]