You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/03/16 22:35:57 UTC
svn commit: r1457314 - in /activemq/activemq-cpp/trunk/activemq-cpp:
README.txt activemq-cpp.pc.in activemq-cpp.spec m4/apr_tools.m4
m4/find_apu.m4
Author: tabish
Date: Sat Mar 16 21:35:56 2013
New Revision: 1457314
URL: http://svn.apache.org/r1457314
Log:
Fix for: https://issues.apache.org/jira/browse/AMQCPP-469
Remove APR-Util from autoconf and from the README
Removed:
activemq/activemq-cpp/trunk/activemq-cpp/m4/find_apu.m4
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/README.txt
activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in
activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.spec
activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4
Modified: activemq/activemq-cpp/trunk/activemq-cpp/README.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/README.txt?rev=1457314&r1=1457313&r2=1457314&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/README.txt (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/README.txt Sat Mar 16 21:35:56 2013
@@ -20,7 +20,6 @@ autoconf >= 2.61
automake >= 1.10
libtool >= 1.5.24
APR >= 1.3*
-APR-Util >= 1.3* or higher
CPPUnit >= 1.10.2* ( 1.12.1 is recommended )
OpenSSL >= 0.9.8m* ( 1.0.0 or higher is recommended, this is an optional dependency)
@@ -55,14 +54,13 @@ The included Visual Studio projects are
that you will configure Visual Studio with the locations of the Platform
SDK and the CPPUnit and APR libraries and headers.
-1.2 APR and APR Util
+1.2 APR
-------------------------------------------------------------------------
-The build requires the APR library and the APR-Util. These libraries can
-be obtained from the APR site at: http://apr.apache.org/ See the
-documentation there on how to build these libraries for your platform. On
-many Unix system the libraries can be installed using the systems package
-installer.
+The build requires the APR library. This library can be obtained from the APR
+site at: http://apr.apache.org/ See the documentation there on how to build
+this libraries for your platform. On many Unix system the library can be
+installed using the systems package installer.
The Library has been tested using version v1.3 and higher of the APR libs,
the older 0.9 version will definitely not work with this library.
@@ -73,12 +71,12 @@ the source download at Apache.
-----------------------------------------------------------------------
|MacOS X Note: |
- | If you have installed APR and APR-Util via MacPorts |
+ | If you have installed APR via MacPorts |
| (http://www.macports.org/) and you are building ActiveMQ-CPP from |
- | source, you will need to specify the location of the APR libraries |
+ | source, you will need to specify the location of the APR library |
| to the configure script. This is easy to do and only requires one |
| extra option for compilation. An example of this is shown below |
- | using the standard location for these libraries as installed by |
+ | using the standard location for this library as installed by |
| MacPorts: |
| |
| $ ./configure \ |
Modified: activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in?rev=1457314&r1=1457313&r2=1457314&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in Sat Mar 16 21:35:56 2013
@@ -23,7 +23,7 @@ includedir=@includedir@
Name: ActiveMQ Client
Description: ActiveMQ C++ library.
Version: @VERSION@
-Requires.private: @APR_PKGCONFIG@ @APU_PKGCONFIG@
+Requires.private: @APR_PKGCONFIG@
Libs: -L${libdir} -l@ACTIVEMQ_LIBRARY_NAME@ -lpthread -ldl -luuid
Cflags: -I${includedir}/@ACTIVEMQ_LIBRARY_NAME@-@VERSION@
Libs.private = @AMQ_LIBS@
Modified: activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.spec
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.spec?rev=1457314&r1=1457313&r2=1457314&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.spec (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.spec Sat Mar 16 21:35:56 2013
@@ -20,7 +20,7 @@ BuildRequires: tetex-latex
BuildRequires: automake >= 1.10
BuildRequires: autoconf >= 2.61
BuildRequires: libtool >= 1.5.24
-BuildRequires: apr-util-devel%{?_isa} >= 1.3
+BuildRequires: apr-devel%{?_isa} >= 1.3
BuildRequires: cppunit-devel%{?_isa} >= 1.10.2
BuildRequires: openssl-devel%{?_isa} >= 0.98.0
Modified: activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4?rev=1457314&r1=1457313&r2=1457314&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4 (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4 Sat Mar 16 21:35:56 2013
@@ -28,20 +28,13 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
[
AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
APR_FIND_APR([], [], 1, [1])
- APR_FIND_APU([], [], 1, [1])
if test $apr_found = "no"; then
AC_MSG_WARN([APR not found])
DECAF_DOWNLOAD_APR
fi
- if test $apu_found = "no"; then
- AC_MSG_WARN([APR Utils not found])
- DECAF_DOWNLOAD_APU
- fi
-
APR_VER_REGEXES=["1\.[3-9]\.[0-9] 1\.[3-9]\.1[0-9] "]
- APU_VER_REGEXES=["1\.[3-9]\.[0-9] 1\.[3-9]\.1[0-9] "]
dnl check APR version number against regex
@@ -65,28 +58,6 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
AC_MSG_ERROR([invalid apr version found, check the README for supported versions.])
fi
- dnl check APU version number against regex
-
- AC_MSG_CHECKING([APU version])
- apu_version="`$apu_config --version`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --version failed])
- fi
- AC_MSG_RESULT([$apu_version])
-
- APU_WANTED_REGEX_MATCH=0
- for apu_wanted_regex in $APU_VER_REGEXES; do
- if test `expr $apr_version : $apu_wanted_regex` -ne 0; then
- APU_WANTED_REGEX_MATCH=1
- break
- fi
- done
-
- if test $APU_WANTED_REGEX_MATCH -eq 0; then
- echo "wanted regexes are $APU_VER_REGEXES"
- AC_MSG_ERROR([invalid apr-util version found, check the README for supported versions.])
- fi
-
dnl Get build information from APR
APR_CPPFLAGS="`$apr_config --cppflags`"
@@ -98,41 +69,24 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
if test $? -ne 0; then
AC_MSG_ERROR([apr-config --includes failed])
fi
- APU_INCLUDES="`$apu_config --includes`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --includes failed])
- fi
APR_LDFLAGS="`$apr_config --ldflags`"
if test $? -ne 0; then
AC_MSG_ERROR([apr-config --ldflags failed])
fi
- APU_LDFLAGS="`$apu_config --ldflags`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --ldflags failed])
- fi
APR_LIBS="`$apr_config --link-libtool --libs`"
if test $? -ne 0; then
AC_MSG_ERROR([apr-config --link-libtool --libs failed])
fi
- APU_LIBS="`$apu_config --link-libtool --libs`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --link-libtool --libs failed])
- fi
APR_PKGCONFIG="`echo $apr_config | sed 's,\(.*/\)\?apr\(-\?.*\)-config$,apr\2,'`"
- APU_PKGCONFIG="`echo $apu_config | sed 's,\(.*/\)\?apu\(-\?.*\)-config$,apr-util\2,'`"
AC_SUBST([APR_LIBS])
AC_SUBST([APR_LDFLAGS])
AC_SUBST([APR_CPPFLAGS])
AC_SUBST([APR_INCLUDES])
AC_SUBST([APR_PKGCONFIG])
- AC_SUBST([APU_LIBS])
- AC_SUBST([APU_LDFLAGS])
- AC_SUBST([APU_INCLUDES])
- AC_SUBST([APU_PKGCONFIG])
])
@@ -146,14 +100,3 @@ AC_DEFUN([DECAF_DOWNLOAD_APR],
AC_MSG_ERROR([no suitable APR found])
])
-
-dnl DECAF_DOWNLOAD_APU()
-dnl no apr-utils found, print out a message telling the user what to do
-AC_DEFUN([DECAF_DOWNLOAD_APU],
-[
- echo "The Apache Portable Runtime (APR) Utils library cannot be found."
- echo "Please install APR Utils on this system and supply the appropriate"
- echo "--with-apr option to 'configure'"
-
- AC_MSG_ERROR([no suitable APR Utils found])
-])