tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
Date Fri, 06 Feb 2004 12:14:53 GMT
jfclere     2004/02/06 04:14:53

  Modified:    jk/native2/server/apache13 Makefile.in
               jk/support jk_apr.m4
  Log:
  Arrange the libtool name. Use *.la instead "guessed" names.
  
  Revision  Changes    Path
  1.10      +6 -4      jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	5 Feb 2004 17:40:22 -0000	1.9
  +++ Makefile.in	6 Feb 2004 12:14:53 -0000	1.10
  @@ -9,7 +9,6 @@
   EXTRA_CFLAGS=@APXS_CFLAGS@
   EXTRA_CPPFLAGS=@APXS_CPPFLAGS@
   JAVA_HOME=@JAVA_HOME@
  -APR_LIBS=`@APR_DIR@/apr-config --libs`
   
   ifdef JAVA_HOME
   JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
  @@ -79,10 +78,13 @@
   
   # ---------- Targets -------------------- 
   
  -all: prepare ${BUILD_DIR}/mod_jk2.so 
  +all: prepare ${BUILD_DIR}/mod_jk2.so
   
  -${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
  -	${MOD_LINK} -o $@ $^ @APR_LDFLAGS@ ${APR_LIBS}
  +${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
  +	$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
  +
  +${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
  +	${MOD_LINK} -o $@ $^ @APR_LDFLAGS@
   
   ${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
   
  
  
  
  1.9       +5 -5      jakarta-tomcat-connectors/jk/support/jk_apr.m4
  
  Index: jk_apr.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_apr.m4	10 Nov 2003 11:05:33 -0000	1.8
  +++ jk_apr.m4	6 Feb 2004 12:14:53 -0000	1.9
  @@ -138,7 +138,7 @@
                 AC_MSG_ERROR(apr configure failed with ${tempret})
               fi
               JK_APR_LIBNAME(apr_libname,${APR_DIR})
  -            APR_LDFLAGS="${APR_DIR}/.libs/${apr_libname}"
  +            APR_LDFLAGS="${APR_DIR}/${apr_libname}"
               APR_LIBDIR=""
   			use_apr=true
               COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
  @@ -204,7 +204,7 @@
                 AC_MSG_ERROR(apr-util configure failed with ${tempret})
               fi
               JK_APR_UTIL_LIBNAME(apr_util_libname,${APR_UTIL_DIR})
  -            APR_LDFLAGS="${APR_LDFLAGS} ${APR_UTIL_DIR}/.libs/${apr_util_libname}"
  +            APR_LDFLAGS="${APR_LDFLAGS} ${APR_UTIL_DIR}/${apr_util_libname}"
               APR_UTIL_LIBDIR=""
   			use_apr=true
               COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
  @@ -326,7 +326,7 @@
       if ${TEST} -z "${jk_apr_get_tempval}" ; then
         AC_MSG_ERROR([$2/apr-config --link-libtool failed])
       fi
  -    jk_apr_get_tempval=`basename ${jk_apr_get_tempval} | sed 's/\.la/\.a/g'`
  +    jk_apr_get_tempval=`basename ${jk_apr_get_tempval}`
       $1="${jk_apr_get_tempval}"
       AC_MSG_RESULT([${jk_apr_get_tempval}])
       unset jk_apr_get_tempval
  @@ -350,7 +350,7 @@
       if ${TEST} -z "${jk_apu_get_tempval}" ; then
         AC_MSG_ERROR([$2/apu-config --link-libtool failed])
       fi
  -    jk_apu_get_tempval=`basename ${jk_apu_get_tempval} | sed 's/\.la/\.a/g'`
  +    jk_apu_get_tempval=`basename ${jk_apu_get_tempval}`
       $1="${jk_apu_get_tempval}"
       AC_MSG_RESULT([${jk_apu_get_tempval}])
       unset jk_apu_get_tempval
  
  
  

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


Mime
View raw message