mturk 2005/03/18 00:17:59 Modified: jk/native configure.in jk/native/apache-1.3 Makefile.apxs.in Makefile.in Log: Move -DJK_PREFORK from apache1.3 makefiles to configure. Fix setsockopt test for Solaris by adding -lsocket. Revision Changes Path 1.43 +7 -3 jakarta-tomcat-connectors/jk/native/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- configure.in 17 Mar 2005 12:48:40 -0000 1.42 +++ configure.in 18 Mar 2005 08:17:59 -0000 1.43 @@ -56,8 +56,10 @@ dnl check for flock function. AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()])) -AC_DEFUN(JK_CHECK_SETSOCKOPT, [ +AC_DEFUN([JK_CHECK_SETSOCKOPT], [ AC_MSG_CHECKING(whether to use $1 with setsockopt()) +saved_LIBS="$LIBS" +LIBS="$saved_LIBS -lsocket" AC_TRY_RUN([ #include <sys/types.h> #include <sys/socket.h> @@ -88,6 +90,7 @@ , [ AC_MSG_RESULT([yes]) AC_DEFINE(USE_$1, 1, [Define to use $1 with setsockopt()]) ] , [ AC_MSG_RESULT([no]) ] ) +LIBS="$saved_LIBS" ])dnl dnl check for SO_RCVTIMEO and SO_SNDTIMEO @@ -141,7 +144,7 @@ APA=`${GREP} STANDARD20 ${APXS}` if ${TEST} -z "$APA" ; then WEBSERVER="apache-1.3" - APXSCFLAGS=`$APXS -q CFLAGS` + APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK" APXS_CPPFLAGS="" else WEBSERVER="apache-2.0" @@ -211,6 +214,7 @@ -I${withval}/src/${osdir}" WEBSERVER="apache-1.3" LIB_JK_TYPE=mod_jk.a + CFLAGS="${CFLAGS} -DJK_PREFORK" AC_MSG_RESULT([${apache_include}, version 1.3]) else AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.]) 1.7 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.apxs.in Index: Makefile.apxs.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.apxs.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.apxs.in 17 Mar 2005 11:37:39 -0000 1.6 +++ Makefile.apxs.in 18 Mar 2005 08:17:59 -0000 1.7 @@ -7,7 +7,7 @@ [EMAIL PROTECTED]@ JK=../common/ -JK_INCL=-DUSE_APACHE_MD5 -DJK_PREFORK -I ${JK} +JK_INCL=-DUSE_APACHE_MD5 -I ${JK} JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads 1.15 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 17 Mar 2005 11:37:39 -0000 1.14 +++ Makefile.in 18 Mar 2005 08:17:59 -0000 1.15 @@ -25,7 +25,7 @@ APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module JK=../common/ -JK_INCL=-DUSE_APACHE_MD5 -DJK_PREFORK -I ${top_srcdir}/common +JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads [EMAIL PROTECTED]@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I${top_srcdir}/common
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]