andya 2004/04/29 10:03:31 Modified: jk/native2 configure.in Added: jk/support jk_dominohome.m4 Log: Added option to specify the location of the NotesAPI if building the Domino connector. Revision Changes Path 1.1 jakarta-tomcat-connectors/jk/support/jk_dominohome.m4 Index: jk_dominohome.m4 =================================================================== dnl dnl Copyright 1999-2004 The Apache Software Foundation dnl dnl Licensed under the Apache License, Version 2.0 (the "License"); dnl you may not use this file except in compliance with the License. dnl You may obtain a copy of the License at dnl dnl http://www.apache.org/licenses/LICENSE-2.0 dnl dnl Unless required by applicable law or agreed to in writing, software dnl distributed under the License is distributed on an "AS IS" BASIS, dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. dnl See the License for the specific language governing permissions and dnl limitations under the License. dnl dnl -------------------------------------------------------------------------- dnl Author Andy Armstrong <[EMAIL PROTECTED]> dnl Shamelessly cribbed from Henri Gomez <[EMAIL PROTECTED]> dnl dnl He was inspired by Pier works on webapp m4 macros :) dnl dnl Version $Id: jk_dominohome.m4,v 1.1 2004/04/29 17:03:31 andya Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- dnl JK_DOMHOME dnl Set the Domino Home directory. dnl $1 => Domino Name dnl $2 => Domino VarName dnl $3 => File which should be present dnl -------------------------------------------------------------------------- AC_DEFUN( [JK_DOMHOME], [ tempval="" AC_MSG_CHECKING([for $1 location]) AC_ARG_WITH( [$1], [ --with-$1=DIR Location of $1 ], [ case "${withval}" in ""|"yes"|"YES"|"true"|"TRUE") ;; "no"|"NO"|"false"|"FALSE") AC_MSG_ERROR(valid $1 location required) ;; *) tempval="${withval}" if ${TEST} ! -d ${tempval} ; then AC_MSG_ERROR(Not a directory: ${tempval}) fi if ${TEST} ! -f ${tempval}/$3; then AC_MSG_ERROR(can't locate ${tempval}/$3) fi ;; esac ]) if ${TEST} -z "$tempval" ; then AC_MSG_RESULT(not provided) else [$2]=${tempval} AC_MSG_RESULT(${[$2]}) fi unset tempval ]) dnl vi:set sts=2 sw=2 autoindent: 1.24 +6 -3 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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- configure.in 26 Mar 2004 13:43:00 -0000 1.23 +++ configure.in 29 Apr 2004 17:03:31 -0000 1.24 @@ -26,6 +26,7 @@ sinclude(../support/jk_exec.m4) sinclude(../support/jk_apr.m4) sinclude(../support/jk_tchome.m4) +sinclude(../support/jk_dominohome.m4) sinclude(../support/jk_java.m4) sinclude(../support/jk_pcre.m4) @@ -126,9 +127,11 @@ AC_SUBST(TOMCAT41_HOME) dnl Domino settings -JK_TCHOME([domino], [DOMINO_HOME], [libnotes.so]) +JK_DOMHOME([domino], [DOMINO_HOME], [libnotes.so]) +JK_DOMHOME([notesapi], [NOTESAPI], [include/global.h]) AC_SUBST(DOMINO_HOME) +AC_SUBST(NOTESAPI) dnl APR settings
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
