[gmime] Bumped version to 2.6.5
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime] Bumped version to 2.6.5
- Date: Sat, 18 Feb 2012 15:12:55 +0000 (UTC)
commit aaea870afaa52ec1b585e0c7b3f3397dca86ec31
Author: Jeffrey Stedfast <fejj gnome org>
Date: Sat Feb 18 10:12:30 2012 -0500
Bumped version to 2.6.5
ChangeLog | 6 ++++++
README | 2 +-
configure.ac | 11 ++++++-----
mono/Makefile.am | 21 ++++++++++++++++-----
4 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1dfcc68..4f0a31f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-02-18 Jeffrey Stedfast <fejj gnome org>
+ * README: Bumped version
+
+ * configure.ac: Bumped version to 2.6.5
+
+2012-02-18 Jeffrey Stedfast <fejj gnome org>
+
* gmime/gmime-parser.c (parser_scan_message_part): Make sure that
a boundary doesn't appear before we start scanning for the
headers.
diff --git a/README b/README
index 923210d..20531e5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- GMime, version 2.6.4
+ GMime, version 2.6.5
by Jeffrey Stedfast <fejj gnome org>
diff --git a/configure.ac b/configure.ac
index e590019..9b37868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,8 @@ AC_PREREQ(2.54)
#
m4_define([gmime_major_version], [2])
m4_define([gmime_minor_version], [6])
-m4_define([gmime_micro_version], [4])
-m4_define([gmime_interface_age], [4])
+m4_define([gmime_micro_version], [5])
+m4_define([gmime_interface_age], [5])
m4_define([gmime_binary_age],
[m4_eval(100 * gmime_minor_version + gmime_micro_version)])
m4_define([gmime_version],
@@ -571,9 +571,10 @@ if test "x$enable_mono" = "xyes"; then
AC_SUBST(API_VERSION)
fi
-AC_ARG_WITH([gacdir], AC_HELP_STRING([--with-gacdir], [Specify the Global Assembly Cache root directory]),,
- [with_gacdir=$prefix/lib])
-gacdir=$(cd "$with_gacdir" && pwd)
+AC_ARG_WITH([gacdir], AC_HELP_STRING([--with-gacdir], [Specify the Global Assembly Cache root directory]),
+ [[with_gacdir=$withval]],
+ [[with_gacdir=\${prefix}/lib]])
+gacdir=$with_gacdir
AC_SUBST(gacdir)
dnl Extra libs
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 9218ac0..05c912b 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -13,7 +13,8 @@ TARGET_API = $(API)
noinst_DATA = $(API) $(ASSEMBLY) $(ASSEMBLY).config
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs gmime-sharp-$(GMIME_API_VERSION).pc
-GACUTIL_FLAGS = -package $(PACKAGE_SHARP) -gacdir $(DESTDIR)$(gacdir)
+GACUTIL_DESTDIR_FLAGS = -package $(PACKAGE_SHARP) -root $(DESTDIR)$(gacdir)
+GACUTIL_FLAGS = -package $(PACKAGE_SHARP) -gacdir $(gacdir)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(PACKAGE_SHARP).pc
@@ -95,14 +96,24 @@ $(ASSEMBLY): $(build_sources) generated-stamp $(srcdir)/$(ASSEMBLY_NAME).snk
install-data-local:
@if test -n '$(TARGET)'; then \
- echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
- $(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
+ if test -n '$(DESTDIR)'; then \
+ echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_DESTDIR_FLAGS)"; \
+ $(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_DESTDIR_FLAGS) || exit 1; \
+ else \
+ echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
+ fi; \
fi
uninstall-local:
@if test -n '$(TARGET)'; then \
- echo "$(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
- $(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1; \
+ if test -n '$(DESTDIR)'; then \
+ echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_DESTDIR_FLAGS)"; \
+ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_DESTDIR_FLAGS) || exit 1; \
+ else \
+ echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
+ fi; \
fi
parse:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]