truk 2004/03/22 08:28:21 Modified: jk/native2/server/apache2 Makefile.in jk/support jk_apxs.m4 Log: Eliminate hardcoded apr-0 lib and determine while configuring. Helps older apache2 versions. Revision Changes Path 1.25 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.in 19 Mar 2004 02:52:22 -0000 1.24 +++ Makefile.in 22 Mar 2004 16:28:21 -0000 1.25 @@ -12,6 +12,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -43,7 +44,7 @@ ifdef APR_LIBDIR_LA JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@ else -JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@ +JK_LDFLAGS=-lcrypt ${APR_LIBS} @PCRE_LIBS@ endif ###### Based on rules.mk ########################################## 1.15 +11 -2 jakarta-tomcat-connectors/jk/support/jk_apxs.m4 Index: jk_apxs.m4 =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_apxs.m4 24 Feb 2004 08:41:40 -0000 1.14 +++ jk_apxs.m4 22 Mar 2004 16:28:21 -0000 1.15 @@ -95,13 +95,21 @@ APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk JK_CHANNEL_APR_SOCKET="\${JK}jk_channel_apr_socket\${OEXT}" JK_POOL_APR="\${JK}jk_pool_apr\${OEXT}" - HAS_APR="-DHAS_APR" APXS$1_CFLAGS="`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`" APXS$1_CPPFLAGS="`${APXS$1} -q EXTRA_CPPFLAGS`" APR_INCDIR="-I`${APXS$1} -q APR_INCLUDEDIR`" APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`" APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`" LIBTOOL=`${APXS$1} -q LIBTOOL` + if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so; then + APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1" + elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so; then + APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0" + elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so; then + APR_LIBS="-L${APACHE2_LIBDIR} -lapr" + else + AC_MSG_ERROR(can't locate libapr) + fi fi AC_MSG_RESULT([building connector for \"$RWEBSERVER\"]) @@ -127,6 +135,7 @@ AC_SUBST(APACHE$1_LIBDIR) AC_SUBST(APACHE$1_CC) AC_SUBST(APXS$1_LDFLAGS) + AC_SUBST(APR_LIBS) ])
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]