Skip to content

Commit

Permalink
Merge branch 'release/0.4.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
suma committed Feb 15, 2013
2 parents f6b4f33 + b8e6854 commit 940d948
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current development
2013-02-15 version 0.4.1:

* Fix header macro for clang
* Fix configure.in for clang with -O4 option
* Update autoconf script for distribution, exclude mplex sources

Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ m4_include(m4/ax_check_link_flag.m4)
AC_CONFIG_AUX_DIR(ac)
AC_CANONICAL_TARGET

AM_INIT_AUTOMAKE(jubatus_mpio, 0.4.0)
AM_INIT_AUTOMAKE(jubatus_mpio, 0.4.1)
AC_CONFIG_HEADER(config.h)

# Default enabled -O4
Expand Down
2 changes: 1 addition & 1 deletion mpsrc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

lib_LTLIBRARIES = libjubatus_mpio.la

libjubatus_mpio_la_LDFLAGS = -version-info 4:0:4
libjubatus_mpio_la_LDFLAGS = -version-info 4:1:4
libjubatus_mpio_la_CPPFLAGS = -I..

libjubatus_mpio_la_SOURCES = \
Expand Down

0 comments on commit 940d948

Please sign in to comment.