svn commit: r1681093 - in /tomcat/native/trunk/native: build/tcnative.m4 configure.in

[rj...@apache.org]

Author: rjung
Date: Fri May 22 12:40:58 2015
New Revision: 1681093

URL: http://svn.apache.org/r1681093
Log:
Fix configure when building against APR which
is not installed in the standard system location.

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=1681093&r1=1681092&r2=1681093&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Fri May 22 12:40:58 2015
@@ -51,11 +51,13 @@ AC_DEFUN(TCN_FIND_APR,[
   APR_BUILD_DIR="`cd $APR_BUILD_DIR && pwd`"
 
   APR_INCLUDES="`$apr_config --includes`"
-  APR_LIBS="`$apr_config --link-libtool --libs`"
+  APR_LIBTOOL_LIBS="`$apr_config --link-libtool --libs`"
+  APR_LIBS="`$apr_config --link-ld --libs`"
   APR_SO_EXT="`$apr_config --apr-so-ext`"
   APR_LIB_TARGET="`$apr_config --apr-lib-target`"
 
   AC_SUBST(APR_INCLUDES)
+  AC_SUBST(APR_LIBTOOL_LIBS)
   AC_SUBST(APR_LIBS)
   AC_SUBST(APR_BUILD_DIR)
 ])
@@ -287,7 +289,7 @@ AC_DEFUN(TCN_FIND_APR_FEATURE,[
   saved_cflags="$CFLAGS"
   saved_libs="$LIBS"
   CFLAGS="$CFLAGS $APR_INCLUDES"
-  LIBS="$LIBS -lapr-1"
+  LIBS="$LIBS $APR_LIBS"
   chk_result=0
   AC_CHECK_LIB(apr-1, $1,[chk_result=1])
   CFLAGS="$saved_cflags"

Modified: tomcat/native/trunk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1681093&r1=1681092&r2=1681093&view=diff
==============================================================================
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Fri May 22 12:40:58 2015
@@ -210,7 +210,7 @@ dnl
 dnl Prep all the flags and stuff for compilation and export to other builds
 dnl
 APR_ADDTO(TCNATIVE_LIBS, [$LIBS])
-APR_ADDTO(TCNATIVE_LIBS, [$APR_LIBS])
+APR_ADDTO(TCNATIVE_LIBS, [$APR_LIBTOOL_LIBS])
 APR_ADDTO(TCNATIVE_LDFLAGS, [$LDFLAGS])
 
 # Link libkstat for Solaris



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org