Author: mturk
Date: Tue Aug 24 08:11:26 2010
New Revision: 988428
URL: http://svn.apache.org/viewvc?rev=988428&view=rev
Log:
Check if APR API feature is actually supported
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/configure.in
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988428&r1=988427&r2=988428&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 08:11:26 2010
@@ -400,3 +400,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/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=988428&r1=988427&r2=988428&view=diff
==============================================================================
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Tue Aug 24 08:11:26 2010
@@ -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
@@ -213,6 +213,9 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
+TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
+
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
AC_SUBST(TCNATIVE_INCLUDES)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
