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 2015/03/11 15:30:01 UTC
[1/2] activemq-cpp git commit:
https://issues.apache.org/jira/browse/AMQCPP-567
Repository: activemq-cpp
Updated Branches:
refs/heads/3.8.x 9b5fd2599 -> 866663835
refs/heads/trunk f07d2bb0f -> 1a71973ec
https://issues.apache.org/jira/browse/AMQCPP-567
wherget patch updates sed command in apr_tools.m4 to account for issues
on Mac.
Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/1a71973e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/1a71973e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/1a71973e
Branch: refs/heads/trunk
Commit: 1a71973ec2e1193b8949f3cd7d97dbd5e0b01aad
Parents: f07d2bb
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Mar 11 10:28:37 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Mar 11 10:28:37 2015 -0400
----------------------------------------------------------------------
activemq-cpp/m4/apr_tools.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/1a71973e/activemq-cpp/m4/apr_tools.m4
----------------------------------------------------------------------
diff --git a/activemq-cpp/m4/apr_tools.m4 b/activemq-cpp/m4/apr_tools.m4
index 76c18c9..56dee7d 100644
--- a/activemq-cpp/m4/apr_tools.m4
+++ b/activemq-cpp/m4/apr_tools.m4
@@ -80,7 +80,7 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
AC_MSG_ERROR([apr-config --link-libtool --libs failed])
fi
- APR_PKGCONFIG="`echo $apr_config | sed 's,\(.*/\)\?apr\(-\?.*\)-config$,apr\2,'`"
+ APR_PKGCONFIG="`echo $apr_config | sed 's/\(.*\/\)\{0,1\}apr\(-\{0,1\}.*\)-config$/apr\2/'`"
AC_SUBST([APR_LIBS])
AC_SUBST([APR_LDFLAGS])
[2/2] activemq-cpp git commit:
https://issues.apache.org/jira/browse/AMQCPP-567
Posted by ta...@apache.org.
https://issues.apache.org/jira/browse/AMQCPP-567
wherget patch updates sed command in apr_tools.m4 to account for issues
on Mac.
Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/86666383
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/86666383
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/86666383
Branch: refs/heads/3.8.x
Commit: 8666638354f04e41e30d0475ae0d1ebfdb182965
Parents: 9b5fd25
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Mar 11 10:28:37 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Mar 11 10:29:12 2015 -0400
----------------------------------------------------------------------
activemq-cpp/m4/apr_tools.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/86666383/activemq-cpp/m4/apr_tools.m4
----------------------------------------------------------------------
diff --git a/activemq-cpp/m4/apr_tools.m4 b/activemq-cpp/m4/apr_tools.m4
index 76c18c9..56dee7d 100644
--- a/activemq-cpp/m4/apr_tools.m4
+++ b/activemq-cpp/m4/apr_tools.m4
@@ -80,7 +80,7 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
AC_MSG_ERROR([apr-config --link-libtool --libs failed])
fi
- APR_PKGCONFIG="`echo $apr_config | sed 's,\(.*/\)\?apr\(-\?.*\)-config$,apr\2,'`"
+ APR_PKGCONFIG="`echo $apr_config | sed 's/\(.*\/\)\{0,1\}apr\(-\{0,1\}.*\)-config$/apr\2/'`"
AC_SUBST([APR_LIBS])
AC_SUBST([APR_LDFLAGS])