You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/09/13 20:40:22 UTC
svn commit: r695001 - in /tomcat/connectors/trunk/jk/native:
apache-1.3/Makefile.apxs.in apache-2.0/Makefile.apxs.in
apache-2.0/Makefile.in configure.in
Author: rjung
Date: Sat Sep 13 11:40:22 2008
New Revision: 695001
URL: http://svn.apache.org/viewvc?rev=695001&view=rev
Log:
Tab, trailing spces and typo in comments police.
Of course we keep the leading tabs in the Makefile templates.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
tomcat/connectors/trunk/jk/native/configure.in
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in?rev=695001&r1=695000&r2=695001&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in Sat Sep 13 11:40:22 2008
@@ -32,8 +32,8 @@
all: mod_jk.so
-mod_jk.so:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL} "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+mod_jk.so:
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL} "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in?rev=695001&r1=695000&r2=695001&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in Sat Sep 13 11:40:22 2008
@@ -32,12 +32,12 @@
all: mod_jk.la
-mod_jk.la:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}" "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+mod_jk.la:
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}" "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
install: mod_jk.la
$(APXS) -i mod_jk.la
-
+
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
rm -rf .libs
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in?rev=695001&r1=695000&r2=695001&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in Sat Sep 13 11:40:22 2008
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-##
+##
APXS=@APXS@
OS=@OS@
@@ -36,9 +36,9 @@
# Will define libexecdir, LIBTOOL, etc
include @APACHE_CONFIG_VARS@
-# Local settings ( overriding/appending to Apache's )
+# Local settings ( overriding/appending to Apache's )
COMMON=../common
-JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
+JK_INCL=-DUSE_APACHE_MD5 -I ${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
CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
@@ -49,7 +49,7 @@
OEXT=.lo
-all: Makefile @LIB_JK_TYPE@
+all: Makefile @LIB_JK_TYPE@
install: @INSTALL_TYPE@
Makefile: Makefile.in
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=695001&r1=695000&r2=695001&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sat Sep 13 11:40:22 2008
@@ -103,20 +103,20 @@
APA=`${GREP} STANDARD20 ${APXS}`
if ${TEST} -z "$APA" ; then
WEBSERVER="apache-1.3"
- APXSCC="`$APXS -q CC`"
- APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
- APXS_CPPFLAGS=""
+ APXSCC="`$APXS -q CC`"
+ APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
+ APXS_CPPFLAGS=""
else
WEBSERVER="apache-2.0"
- APRINCLUDEDIR=""
- INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
- for INC in ${INCTEMP}; do
- APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
- done
+ APRINCLUDEDIR=""
+ INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
+ for INC in ${INCTEMP}; do
+ APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
+ done
AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
- APXSCC="`$APXS -q CC`"
- APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
- APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
+ APXSCC="`$APXS -q CC`"
+ APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
+ APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
APACHE_CONFIG_VARS="`${APXS} -q exp_installbuilddir`/config_vars.mk"
LIBTOOL=`$APXS -q LIBTOOL`
fi
@@ -134,7 +134,7 @@
fi
],
[
- AC_MSG_RESULT(no apxs given)
+ AC_MSG_RESULT(no apxs given)
])
AC_SUBST(APACHE_CONFIG_VARS)
@@ -390,7 +390,7 @@
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
],
[
- AC_MSG_RESULT(no apache given)
+ AC_MSG_RESULT(no apache given)
])
AC_SUBST(apache_include)
@@ -409,7 +409,7 @@
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
],
[
- AC_MSG_RESULT(no netscape given)
+ AC_MSG_RESULT(no netscape given)
])
dnl Check for enable-jni
@@ -524,11 +524,11 @@
dnl APXSLDFLAGS=""
dnl APXSCFLAGS=""
if ${TEST} -n "${CFLAGS}" ; then
- APXSCFLAGS="${APXSCFLAGS} ${CFLAGS}"
+ APXSCFLAGS="${APXSCFLAGS} ${CFLAGS}"
fi
-dnl the APXSLDFLAGS is normaly empty but APXSCFLAGS is not.
+dnl the APXSLDFLAGS is normally empty but APXSCFLAGS is not.
if ${TEST} -n "${LDFLAGS}" ; then
- APXSLDFLAGS="-Wl,${LDFLAGS}"
+ APXSLDFLAGS="-Wl,${LDFLAGS}"
fi
AC_SUBST(APXSCFLAGS)
AC_SUBST(APXSCPPFLAGS)
@@ -550,9 +550,9 @@
dnl oh well, this is what --with-java2 is for.
if ${TEST} -n "${JAVA_HOME}" ; then
- JAVA_HOME_ENV="${JAVA_HOME}"
+ JAVA_HOME_ENV="${JAVA_HOME}"
else
- JAVA_HOME_ENV=""
+ JAVA_HOME_ENV=""
fi
JAVA_HOME=""
JAVA_PLATFORM="1"
@@ -602,34 +602,28 @@
for JAVA_PREFIX in \
- /usr/local \
- /usr/local/lib \
- /usr \
- /usr/lib \
- /opt \
- /
+ /usr/local \
+ /usr/local/lib \
+ /usr \
+ /usr/lib \
+ /opt \
+ /
do
for JAVA_PLATFORM in 3 2 1 ;
do
for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 "" ;
+ do
+ for VARIANT in IBMJava2- java java- jdk jdk-;
do
- for VARIANT in IBMJava2- java java- jdk jdk-;
- do
- GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
-dnl AC_MSG_CHECKING([${GUESS}])
- if ${TEST} -d "${GUESS}/bin" \
- && ${TEST} -d "${GUESS}/include" ; then
-
- JAVA_HOME="${GUESS}"
- AC_MSG_RESULT([${GUESS}])
- break
- fi
-
- done
-
- if ${TEST} -n "${JAVA_HOME}" ; then
- break;
+ GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
+dnl AC_MSG_CHECKING([${GUESS}])
+ if ${TEST} -d "${GUESS}/bin" \
+ && ${TEST} -d "${GUESS}/include" ; then
+
+ JAVA_HOME="${GUESS}"
+ AC_MSG_RESULT([${GUESS}])
+ break
fi
done
@@ -647,30 +641,36 @@
done
if ${TEST} -n "${JAVA_HOME}" ; then
+ break;
+ fi
- dnl Just to have the messages looking uniformly
+ done
- AC_MSG_CHECKING(Java platform)
- AC_MSG_RESULT([guess ${JAVA_PLATFORM}])
- fi
+ if ${TEST} -n "${JAVA_HOME}" ; then
+
+ dnl Just to have the messages looking uniformly
+
+ AC_MSG_CHECKING(Java platform)
+ AC_MSG_RESULT([guess ${JAVA_PLATFORM}])
+ fi
else
- AC_MSG_CHECKING(Java platform)
+ AC_MSG_CHECKING(Java platform)
- AC_ARG_WITH(java-platform,
- [AS_HELP_STRING([--with-java-platform=VAL],
- [Force the Java platform
- (value is 1 for 1.1.x or 2 for 1.2.x or greater)])],
- [
- dnl This requires a bit of tweaking to be handled properly, but
- dnl the default is good enough
+ AC_ARG_WITH(java-platform,
+ [AS_HELP_STRING([--with-java-platform=VAL],
+ [Force the Java platform
+ (value is 1 for 1.1.x or 2 for 1.2.x or greater)])],
+ [
+ dnl This requires a bit of tweaking to be handled properly, but
+ dnl the default is good enough
- JAVA_PLATFORM="2"
- ])
+ JAVA_PLATFORM="2"
+ ])
- AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
+ AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
fi
dnl end of JServ ;=)
@@ -694,7 +694,7 @@
[
AC_MSG_CHECKING(os_type directory)
if ${TEST} -f ${JAVA_HOME}/include/jni_md.h; then
- OS=""
+ OS=""
else
for f in ${JAVA_HOME}/include/*/jni_md.h; do
if ${TEST} -f $f; then
@@ -716,7 +716,7 @@
dnl Check that a WEBSERVER has been given
if ${TEST} -z "$WEBSERVER" ; then
- AC_MSG_ERROR(Cannot find the WebServer)
+ AC_MSG_ERROR(Cannot find the WebServer)
fi
dnl Add common to subdir list
@@ -727,14 +727,14 @@
AM_CONDITIONAL(MAKE_DYNAMIC_APACHE, ${TEST} "${apache_dir_is_src}" = "false")
if ${TEST} "${apache_dir_is_src}" = "false" ; then
-dnl normal apxs handling
- APACHE20_OEXT=.c
- LIB_JK_TYPE=mod_jk.so
- INSTALL_TYPE=install_dynamic
+ dnl normal apxs handling
+ APACHE20_OEXT=.c
+ LIB_JK_TYPE=mod_jk.so
+ INSTALL_TYPE=install_dynamic
else
-dnl install static library in apache sources.
- APACHE20_OEXT=.lo
- INSTALL_TYPE=install_static
+ dnl install static library in apache sources.
+ APACHE20_OEXT=.lo
+ INSTALL_TYPE=install_static
fi
AC_SUBST(APACHE20_OEXT)
AC_SUBST(LIB_JK_TYPE)
@@ -743,16 +743,16 @@
dnl automake needs the path it does not work with $WEBSERVER
dnl that why useless Makefiles are build.
AC_OUTPUT([
- Makefile
- apache-1.3/Makefile
- apache-1.3/Makefile.apxs
- apache-2.0/Makefile
- apache-2.0/Makefile.apxs
- common/Makefile
- common/list.mk
- common/jk_types.h
- jni/Makefile
- ])
+ Makefile
+ apache-1.3/Makefile
+ apache-1.3/Makefile.apxs
+ apache-2.0/Makefile
+ apache-2.0/Makefile.apxs
+ common/Makefile
+ common/list.mk
+ common/jk_types.h
+ jni/Makefile
+])
if ${TEST} -n "${WARN_CC}" ; then
AC_MSG_WARN([Using CC from environment:])
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org