jfclere 01/11/02 10:42:25
Modified: jk/native configure.in
jk/native/apache-1.3 Makefile.am
jk/native/apache-2.0 Makefile.in
jk/native/common Makefile.in
jk/native/jni Makefile.in
jk/native/scripts/build rules.mk
Added: jk/native/scripts/build config_vars.mk
Log:
Add use of the libtool of Apache-2.0 when installed.
Comment out VPATH and add common in configure. (I think VPATH does not work on
all platforms).
Revision Changes Path
1.15 +9 -6 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.in 2001/10/26 18:25:09 1.14
+++ configure.in 2001/11/02 18:42:25 1.15
@@ -1,7 +1,7 @@
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id: configure.in,v 1.14 2001/10/26 18:25:09 costin Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.15 2001/11/02 18:42:25 jfclere Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_ajp13.h)
@@ -46,6 +46,7 @@
AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
AC_SUBST(MKDIR)
+APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
WEBSERVER=""
apache_dir=""
apache_include=""
@@ -84,26 +85,28 @@
AC_MSG_ERROR(You must specify a valid --with-apxs path)
fi
+ dnl apache_dir and apache_include are also needed.
+ apache_dir=`$APXS -q PREFIX`
+ apache_include="-I`$APXS -q INCLUDEDIR`"
+
dnl test apache version
APA=`${GREP} STANDARD20 ${APXS}`
if ${TEST} -z "$APA" ; then
WEBSERVER="apache-1.3"
else
WEBSERVER="apache-2.0"
+ APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
fi
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
AC_SUBST(APXS)
-
- dnl apache_dir and apache_include are also needed.
- apache_dir=`$APXS -q PREFIX`
- apache_include="-I`$APXS -q INCLUDEDIR`"
fi
fi
],
[
AC_MSG_RESULT(no apxs given)
])
+AC_SUBST(APACHE_CONFIG_VARS)
dnl Apache-2.0 needs the os subdirectory to include os.h
dnl this include is copy from os/config.m4
@@ -410,7 +413,7 @@
fi
dnl Add common to subdir list
-WEBSERVER="${WEBSERVER}"
+WEBSERVER="common ${WEBSERVER}"
AC_SUBST(WEBSERVER)
1.5 +2 -9 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 2001/10/26 18:25:09 1.4
+++ Makefile.am 2001/11/02 18:42:25 1.5
@@ -9,14 +9,10 @@
DESTDIR=@APACHE_DIR@
libdir=/libexec
-VPATH=.:../common
+#VPATH=.:../common
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
-if MAKE_DYNAMIC_APACHE
-JK=
-else
-JK=../common
-endif
+JK=../common/
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
@@ -63,6 +59,3 @@
@echo "make"
@echo ""
endif
-
-clean:
- -rm *.o *.so *.a
1.12 +2 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 2001/10/26 18:25:09 1.11
+++ Makefile.in 2001/11/02 18:42:25 1.12
@@ -8,16 +8,15 @@
MKDIR=@MKDIR@
# Defaults
-LIBTOOL=libtool
libexecdir=${APACHE_DIR}/modules
-JK=
+JK=../common/
# Defines APACHE_OBJECTS - the list of all common files
include ../common/list.mk
# Apache2 settings, values guessed by Apache config and used to build it
# Will define libexecdir, LIBTOOL, etc
-include ${APACHE_DIR}/build/config_vars.mk
+include @APACHE_CONFIG_VARS@
# Local settings ( overriding/appending to Apache's )
COMMON=../common
1.5 +1 -0 jakarta-tomcat-connectors/jk/native/common/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 2001/10/26 18:25:09 1.4
+++ Makefile.in 2001/11/02 18:42:25 1.5
@@ -1,6 +1,7 @@
#### XXXX DO we need this Makefile ????
OEXT=.lo
include list.mk
+include @APACHE_CONFIG_VARS@
JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
CFLAGS=@apache_include@ @CFLAGS@ ${JAVA_INCL}
1.4 +3 -3 jakarta-tomcat-connectors/jk/native/jni/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 2001/10/25 23:42:06 1.3
+++ Makefile.in 2001/11/02 18:42:25 1.4
@@ -1,6 +1,8 @@
OEXT=.lo
+include @APACHE_CONFIG_VARS@
-COMMON_OBJECTS=jk_map${OEXT} jk_util${OEXT} jk_pool${OEXT}
+JK=../common/
+COMMON_OBJECTS=${JK}jk_map${OEXT} ${JK}jk_util${OEXT} ${JK}jk_pool${OEXT}
JNI_OBJECTS=jk_jnicb${OEXT} ${COMMON_OBJECTS}
@@ -8,8 +10,6 @@
CFLAGS=@apache_include@ @CFLAGS@ ${JAVA_INCL} -D_REENTRANT -Wall
include ../scripts/build/rules.mk
-
-JK=.
all: Makefile jni_connect.so
1.4 +1 -1 jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk
Index: rules.mk
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/scripts/build/rules.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rules.mk 2001/10/26 18:25:09 1.3
+++ rules.mk 2001/11/02 18:42:25 1.4
@@ -2,7 +2,7 @@
#
# Compile commands
-VPATH=.:../common
+#VPATH=.:../common
COMPILE = $(CC) $(CFLAGS)
LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -c $<
# && touch $@
1.1 jakarta-tomcat-connectors/jk/native/scripts/build/config_vars.mk
Index: config_vars.mk
===================================================================
# libtool is given by Apache-2.0 when installed otherwise we provide it.
LIBTOOL = $(SHELL) ../libtool
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
