activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1370775 - in /activemq/activemq-cpp/trunk/activemq-cpp: activemq-cpp.pc.in m4/apr_tools.m4
Date Wed, 08 Aug 2012 14:03:53 GMT
Author: tabish
Date: Wed Aug  8 14:03:53 2012
New Revision: 1370775

URL: http://svn.apache.org/viewvc?rev=1370775&view=rev
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQCPP-419

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in
    activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4

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=1370775&r1=1370774&r2=1370775&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in Wed Aug  8 14:03:53 2012
@@ -23,6 +23,7 @@ includedir=@includedir@
 Name: ActiveMQ Client
 Description: ActiveMQ C++ library.
 Version: @VERSION@
+Requires.private: @APR_PKGCONFIG@ @APU_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/m4/apr_tools.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4?rev=1370775&r1=1370774&r2=1370775&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4 (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/m4/apr_tools.m4 Wed Aug  8 14:03:53 2012
@@ -121,13 +121,18 @@ AC_DEFUN([DECAF_CONFIGURE_APR],
     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])
 
 ])
 



Mime
View raw message