truk 2004/02/09 20:39:51
Modified: jk/native2/server/apache13 Makefile.apxs.in
jk/native2/server/apache2 Makefile.apxs.in
Log:
JAVA_HOME is always defined now. Adjust conditionals.
Revision Changes Path
1.9 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 9 Feb 2004 20:18:48 -0000 1.8
+++ Makefile.apxs.in 10 Feb 2004 04:39:51 -0000 1.9
@@ -16,7 +16,7 @@
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
1.8 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.apxs.in 5 Feb 2004 17:40:22 -0000 1.7
+++ Makefile.apxs.in 10 Feb 2004 04:39:51 -0000 1.8
@@ -13,7 +13,7 @@
JKINC=${JK_DIR}/include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
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
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
