jfclere 2004/02/08 14:05:56
Modified: jk/native2 configure.in
jk/support jk_ws.m4
Log:
Arrange the logic (now --with-apache13 works OK).
Revision Changes Path
1.18 +14 -28 jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in 6 Feb 2004 23:26:29 -0000 1.17
+++ configure.in 8 Feb 2004 22:05:56 -0000 1.18
@@ -123,45 +123,31 @@
JK_APXS([2], [location of apxs for Apache 2.0])
dnl APACHE13 settings
-AC_MSG_RESULT([Checking for apache13...])
+AC_MSG_CHECKING([checking for apache13...])
JK_WS_DIR([apache13], [APACHE], [src/include/httpd.h], [server/apache13])
-JK_WS_INCDIR([apache13], [httpd.h])
-JK_WS_LIBDIR([apache13])
+JK_WS_INCDIR([apache13], [APACHE], [httpd.h])
+JK_WS_LIBDIR([apache13], [APACHE])
dnl APACHE2 settings
-AC_MSG_RESULT([Checking for apache20...])
+AC_MSG_CHECKING([checking for apache20...])
JK_WS_DIR([apache2], [APACHE2], [include/httpd.h], [server/apache2])
-JK_WS_INCDIR([apache2], [httpd.h])
-JK_WS_LIBDIR([apache2])
+JK_WS_INCDIR([apache2], [APACHE2], [httpd.h])
+JK_WS_LIBDIR([apache2], [APACHE2])
dnl IIS settings
-AC_MSG_RESULT([Checking for iis...])
+AC_MSG_CHECKING([checking for iis...])
JK_WS_DIR([iis], [IIS], [.], [server/isapi])
-JK_WS_INCDIR([iis], [.])
-JK_WS_LIBDIR([iis])
-
-AC_SUBST(IIS_CFLAGS)
-AC_SUBST(IIS_DIR)
-AC_SUBST(IIS_HOME)
-AC_SUBST(IIS_INCDIR)
-AC_SUBST(IIS_LDFLAGS)
-AC_SUBST(IIS_LIBDIR)
+JK_WS_INCDIR([iis], [IIS], [.])
+JK_WS_LIBDIR([iis], [IIS])
dnl iPlanet settings
-AC_MSG_RESULT([Checking for iPlanet...])
+AC_MSG_CHECKING([checking for iPlanet...])
JK_WS_DIR([iplanet], [IPLANET], [.], [server/aolserver])
-JK_WS_INCDIR([iplanet], [.])
-JK_WS_LIBDIR([iplanet])
-
-AC_SUBST(IPLANET_CFLAGS)
-AC_SUBST(IPLANET_DIR)
-AC_SUBST(IPLANET_HOME)
-AC_SUBST(IPLANET_INCDIR)
-AC_SUBST(IPLANET_LDFLAGS)
-AC_SUBST(IPLANET_LIBDIR)
+JK_WS_INCDIR([iplanet], [IPLANET], [.])
+JK_WS_LIBDIR([iplanet], [IPLANET])
dnl TOMCATs settings
1.5 +52 -13 jakarta-tomcat-connectors/jk/support/jk_ws.m4
Index: jk_ws.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_ws.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_ws.m4 6 Feb 2004 23:26:29 -0000 1.4
+++ jk_ws.m4 8 Feb 2004 22:05:56 -0000 1.5
@@ -83,7 +83,7 @@
""|"yes"|"YES"|"true"|"TRUE")
;;
"no"|"NO"|"false"|"FALSE")
- AC_MSG_ERROR(valid apr source dir location required)
+ AC_MSG_ERROR(valid $1 source dir location required)
;;
*)
tempval="${withval}"
@@ -101,16 +101,43 @@
$2_CFLAGS="-I ${tempval}/include"
$2_DIR=${tempval}
$2_HOME="${tempval}"
- $2_INCDIR="${tempval}/include"
+ if ${TEST} -d ${withval}/include ; then
+ $2_INCL="-I${tempval}/include"
+ $2_INCDIR="${tempval}/include"
+ fi
+ if ${TEST} -d ${withval}/src/include ; then
+ # read osdir from the existing apache.
+ osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e
's:^OSDIR=.*/os:os:'`
+ if ${TEST} -z "${osdir}" ; then
+ osdir=os/unix
+ fi
+ $2_INCL="-I${tempval}/src/include -I${withval}/src/${osdir}"
+ $2_INCDIR="${tempval}/src/include"
+ fi
$2_LDFLAGS=""
$2_LIBDIR=""
WEBSERVERS="${WEBSERVERS} $4"
- AC_MSG_RESULT($1_DIR)
+
+ AC_SUBST($2_BUILD)
+ AC_SUBST($2_CFLAGS)
+ AC_SUBST($2_DIR)
+ AC_SUBST($2_HOME)
+ AC_SUBST($2_INCL)
+ AC_SUBST($2_INCDIR)
+ AC_SUBST($2_LDFLAGS)
+ AC_SUBST($2_LIBDIR)
+
fi
;;
esac
])
+ if ${TEST} -z "$tempval" ; then
+ AC_MSG_RESULT(not provided)
+ else
+ AC_MSG_RESULT(${tempval})
+ fi
+
unset tempval
])
@@ -134,7 +161,7 @@
""|"yes"|"YES"|"true"|"TRUE")
;;
"no"|"NO"|"false"|"FALSE")
- AC_MSG_ERROR(valid apr include dir location required)
+ AC_MSG_ERROR(valid $1 include dir location required)
;;
*)
tempval="${withval}"
@@ -147,12 +174,18 @@
fi
if ${TEST} ! -z "$tempval" ; then
- $1_BUILD=""
- $1_CFLAGS="-I${tempval}"
- $1_CLEAN=""
- $1_DIR=""
- $1_INCDIR=${tempval}
- AC_MSG_RESULT($1_INCL)
+ $2_BUILD=""
+ $2_CFLAGS="-I${tempval}"
+ $2_CLEAN=""
+ $2_DIR=""
+ $2_INCDIR=${tempval}
+ AC_MSG_RESULT($2_INCDIR)
+
+ AC_SUBST($2_BUILD)
+ AC_SUBST($2_CFLAGS)
+ AC_SUBST($2_CLEAN)
+ AC_SUBST($2_DIR)
+ AC_SUBST($2_INCDIR)
fi
;;
esac
@@ -180,7 +213,7 @@
""|"yes"|"YES"|"true"|"TRUE")
;;
"no"|"NO"|"false"|"FALSE")
- AC_MSG_ERROR(valid apr lib dir location required)
+ AC_MSG_ERROR(valid $1 lib directory location required)
;;
*)
tempval="${withval}"
@@ -195,7 +228,13 @@
$2_DIR=""
$2_LIBDIR=${tempval}
$2_LDFLAGS=""
- AC_MSG_RESULT($1_LIB)
+ AC_MSG_RESULT($2_LIBDIR)
+
+ AC_SUBST($2_BUILD)
+ AC_SUBST($2_CLEAN)
+ AC_SUBST($2_DIR)
+ AC_SUBST($2_LIBDIR)
+ AC_SUBST($2_LDFLAGS)
fi
;;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
