Author: rjung
Date: Sat May 23 10:18:28 2015
New Revision: 1681313
URL: http://svn.apache.org/r1681313
Log:
Check if APR API feature is actually supported.
Backport of r988428 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/native/configure.in
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:18:28 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,988428,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=1681313&r1=1681312&r2=1681313&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Sat May 23 10:18:28
2015
@@ -411,3 +411,20 @@ then
APR_ADDTO(CFLAGS, [-DHAVE_OPENSSL])
fi
])
+
+dnl
+dnl TCN_FIND_APR_FEATURE: figure out if APR feature is suipported
+dnl
+AC_DEFUN(TCN_FIND_APR_FEATURE,[
+ saved_cflags="$CFLAGS"
+ saved_libs="$LIBS"
+ CFLAGS="$CFLAGS $APR_INCLUDES"
+ LIBS="$LIBS -lapr-1"
+ chk_result=0
+ AC_CHECK_LIB(apr-1, $1,[chk_result=1])
+ CFLAGS="$saved_cflags"
+ LIBS="$saved_libs"
+ if test "$chk_result" != "0"; then
+ APR_ADDTO(CFLAGS, [-DHAVE_$2])
+ fi
+])
Modified: tomcat/native/branches/1.1.x/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/configure.in?rev=1681313&r1=1681312&r2=1681313&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/configure.in (original)
+++ tomcat/native/branches/1.1.x/native/configure.in Sat May 23 10:18:28 2015
@@ -140,7 +140,7 @@ dnl
use_openssl=true;
-AC_ARG_ENABLE(openssl,
+AC_ARG_ENABLE(openssl,
[AS_HELP_STRING([--disable-openssl],[avoid using OpenSSL toolkit])],
[
case "${enableval}" in
@@ -224,7 +224,9 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
+TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
