Merging in Fixes for the 2.0.1 release
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.0.1@533839 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index f20f6e9..958ceb8 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,4 +1,29 @@
=========================================================================
+== Release Notes for ActiveMQ CPP 2.0.1 ==
+=========================================================================
+
+== Overview ==
+
+This version is a bug fix release for issues that were found in the 2.0 release
+
+NOTE: Compatable with ActiveMQ Broker version >= 4.0.2
+
+== Issues Resolved ==
+
+Bug
+
+ * [AMQCPP-105] - Openwire ActiveMQMessage sets Persistant flag incorrectly
+ * [AMQCPP-107] - SocketInputStream::read() doesn't check for EINTR error
+ * [AMQCPP-109] - Exception when acknowledging null messages, originating from the receipt of an ObjectMessage
+ * [AMQCPP-112] - Openwire Experiation Integration tests fail when fixed to actually use Openwire
+
+Improvement
+
+ * [AMQCPP-101] - Add the Ability to set the TcpNoDelay flag of a TCP Socket
+ * [AMQCPP-102] - Create a Tag for CMS
+
+
+=========================================================================
== Release Notes for ActiveMQ CPP 2.0 ==
=========================================================================
diff --git a/configure.ac b/configure.ac
index 4e05f36..b195ff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@
## Define the Version variables
## -----------------------------------------------
ACTIVEMQ_LIBRARY_NAME=activemq-cpp
-ACTIVEMQ_VERSION=2.0
+ACTIVEMQ_VERSION=2.0.1
ACTIVEMQ_LIBRARY_VERSION=0:0:0
ACTIVEMQ_RELEASE=0.0
ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
@@ -83,7 +83,7 @@
AC_CHECK_FUNCS([ioctl select gettimeofday time ftime])
-AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no; AC_MSG_RESULT([no. Unit and Integration tests disabled]))
+AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no; AC_MSG_RESULT([no. Unit and Integration tests disabled]))
AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, test x$cppunit = xyes)
CXXFLAGS="$CXXFLAGS -W -Wall -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
@@ -93,16 +93,16 @@
case "${host_os}" in
*darwin* ) ## Mac OS X configuration
- CXXFLAGS="-ansi -pedantic $CXXFLAGS"
+ CXXFLAGS="-ansi -pedantic $CXXFLAGS"
LIBS="$LIBS"
;;
*cygwin* ) ## Cygwin configuration
# LIBS="-lwinmm -lm";
- CXXFLAGS="$CXXFLAGS -Wno-uninitialized"
+ CXXFLAGS="$CXXFLAGS -Wno-uninitialized"
LIBS="$LIBS -lm -lpthread -luuid -lrpcrt4"
;;
-
+
*solaris* ) ## Solaris configuration
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
@@ -110,13 +110,13 @@
CXXFLAGS="-ansi -pedantic $CXXFLAGS"
LIBS="$LIBS -lm -lpthread -luuid -lsocket -lrt"
;;
-
+
*) ## Unix configuration
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!]))
- CXXFLAGS="-ansi -pedantic $CXXFLAGS"
+ CXXFLAGS="-ansi -pedantic $CXXFLAGS"
LIBS="$LIBS -lm -lpthread -luuid"
esac
@@ -139,7 +139,7 @@
(void) a.ai_flags;
} while(0)
],
- [
+ [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_STRUCT_ADDRINFO,, [define if you have struct addrinfo])
],
