Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix for: https://issues.apache.org/jira/browse/AMQCPP-469

Remove APR-Util from autoconf and from the README

git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk@1457314 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit f13b164ca16b0e643498edcba0eacd315bb3b5d6 1 parent 0a327a4
Timothy A. Bish authored
View
18 activemq-cpp/README.txt
@@ -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 configured with the assumption
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 \ |
View
2  activemq-cpp/activemq-cpp.pc.in
@@ -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@
View
2  activemq-cpp/activemq-cpp.spec
@@ -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
View
57 activemq-cpp/m4/apr_tools.m4
@@ -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])
-])
View
211 activemq-cpp/m4/find_apu.m4
@@ -1,211 +0,0 @@
-dnl -------------------------------------------------------- -*- autoconf -*-
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements. See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License. You may obtain a copy of the License at
-dnl
-dnl http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
-
-dnl
-dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
-dnl
-dnl This macro file can be used by applications to find and use the APU
-dnl library. It provides a standardized mechanism for using APU. It supports
-dnl embedding APU into the application source, or locating an installed
-dnl copy of APU.
-dnl
-dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
-dnl detailed-check)
-dnl
-dnl where srcdir is the location of the bundled APU source directory, or
-dnl empty if source is not bundled.
-dnl
-dnl where builddir is the location where the bundled APU will be built,
-dnl or empty if the build will occur in the srcdir.
-dnl
-dnl where implicit-install-check set to 1 indicates if there is no
-dnl --with-apr-util option specified, we will look for installed copies.
-dnl
-dnl where acceptable-majors is a space separated list of acceptable major
-dnl version numbers. Often only a single major version will be acceptable.
-dnl If multiple versions are specified, and --with-apr-util=PREFIX or the
-dnl implicit installed search are used, then the first (leftmost) version
-dnl in the list that is found will be used. Currently defaults to [0 1].
-dnl
-dnl where detailed-check is an M4 macro which sets the apu_acceptable to
-dnl either "yes" or "no". The macro will be invoked for each installed
-dnl copy of APU found, with the apu_config variable set appropriately.
-dnl Only installed copies of APU which are considered acceptable by
-dnl this macro will be considered found. If no installed copies are
-dnl considered acceptable by this macro, apu_found will be set to either
-dnl either "no" or "reconfig".
-dnl
-dnl Sets the following variables on exit:
-dnl
-dnl apu_found : "yes", "no", "reconfig"
-dnl
-dnl apu_config : If the apu-config tool exists, this refers to it. If
-dnl apu_found is "reconfig", then the bundled directory
-dnl should be reconfigured *before* using apu_config.
-dnl
-dnl Note: this macro file assumes that apr-config has been installed; it
-dnl is normally considered a required part of an APR installation.
-dnl
-dnl Note: At this time, we cannot find *both* a source dir and a build dir.
-dnl If both are available, the build directory should be passed to
-dnl the --with-apr-util switch.
-dnl
-dnl Note: the installation layout is presumed to follow the standard
-dnl PREFIX/lib and PREFIX/include pattern. If the APU config file
-dnl is available (and can be found), then non-standard layouts are
-dnl possible, since it will be described in the config file.
-dnl
-dnl If a bundled source directory is available and needs to be (re)configured,
-dnl then apu_found is set to "reconfig". The caller should reconfigure the
-dnl (passed-in) source directory, placing the result in the build directory,
-dnl as appropriate.
-dnl
-dnl If apu_found is "yes" or "reconfig", then the caller should use the
-dnl value of apu_config to fetch any necessary build/link information.
-dnl
-
-AC_DEFUN([APR_FIND_APU], [
- apu_found="no"
-
- if test "$target_os" = "os2-emx"; then
- # Scripts don't pass test -x on OS/2
- TEST_X="test -f"
- else
- TEST_X="test -x"
- fi
-
- ifelse([$4], [],
- [
- ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APU 0.x then APU 1.x]))
- acceptable_majors="0 1"
- ], [acceptable_majors="$4"])
-
- apu_temp_acceptable_apu_config=""
- for apu_temp_major in $acceptable_majors
- do
- case $apu_temp_major in
- 0)
- apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"
- ;;
- *)
- apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"
- ;;
- esac
- done
-
- AC_MSG_CHECKING(for APR-util)
- AC_ARG_WITH(apr-util,
- [ --with-apr-util=PATH prefix for installed APU or the full path to
- apu-config],
- [
- if test "$withval" = "no" || test "$withval" = "yes"; then
- AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
- fi
-
- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
- do
- for lookdir in "$withval/bin" "$withval"
- do
- if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
- apu_config="$lookdir/$apu_temp_apu_config_file"
- ifelse([$5], [], [], [
- apu_acceptable="yes"
- $5
- if test "$apu_acceptable" != "yes"; then
- AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
- continue
- fi])
- apu_found="yes"
- break 2
- fi
- done
- done
-
- if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
- apu_config="$withval"
- ifelse([$5], [], [apu_found="yes"], [
- apu_acceptable="yes"
- $5
- if test "$apu_acceptable" = "yes"; then
- apu_found="yes"
- fi])
- fi
-
- dnl if --with-apr-util is used, it is a fatal error for its argument
- dnl to be invalid
- if test "$apu_found" != "yes"; then
- AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])
- fi
- ],[
- if test -n "$3" && test "$3" = "1"; then
- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
- do
- if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
- apu_config="$apu_temp_apu_config_file"
- ifelse([$5], [], [], [
- apu_acceptable="yes"
- $5
- if test "$apu_acceptable" != "yes"; then
- AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
- continue
- fi])
- apu_found="yes"
- break
- else
- dnl look in some standard places (apparently not in builtin/default)
- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
- ifelse([$5], [], [], [
- apu_acceptable="yes"
- $5
- if test "$apu_acceptable" != "yes"; then
- AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
- continue
- fi])
- apu_found="yes"
- break 2
- fi
- done
- fi
- done
- fi
- dnl if we have not found anything yet and have bundled source, use that
- if test "$apu_found" = "no" && test -d "$1"; then
- apu_temp_abs_srcdir="`cd $1 && pwd`"
- apu_found="reconfig"
- apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
- case $apu_bundled_major in
- "")
- AC_MSG_ERROR([failed to find major version of bundled APU])
- ;;
- 0)
- apu_temp_apu_config_file="apu-config"
- ;;
- *)
- apu_temp_apu_config_file="apu-$apu_bundled_major-config"
- ;;
- esac
- if test -n "$2"; then
- apu_config="$2/$apu_temp_apu_config_file"
- else
- apu_config="$1/$apu_temp_apu_config_file"
- fi
- fi
- ])
-
- AC_MSG_RESULT($apu_found)
-])
Please sign in to comment.
Something went wrong with that request. Please try again.