pier 01/08/06 10:59:49 Modified: webapp/support apjava.m4 buildconf.sh Added: webapp/support aplocal.m4 Log: - Fixed license typos/mistakes - Uppercasing of all exported variables - M4 Sources cleanup - Moved LOCAL_* AutoConf functions in new aplocal.m4 Revision Changes Path 1.5 +23 -17 jakarta-tomcat-connectors/webapp/support/apjava.m4 Index: apjava.m4 =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/apjava.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apjava.m4 2001/08/01 17:14:29 1.4 +++ apjava.m4 2001/08/06 17:59:49 1.5 @@ -26,10 +26,10 @@ dnl Alternately, this acknowlegement may appear in the software itself, if dnl and wherever such third-party acknowlegements normally appear. dnl -dnl 4. The names "The Jakarta Project", "WebApp", and "Apache Software -dnl Foundation" must not be used to endorse or promote products derived -dnl from this software without prior written permission. For written -dnl permission, please contact <[EMAIL PROTECTED]>. +dnl 4. The names "The Jakarta Project", "Apache WebApp Module", and "Apache +dnl Software Foundation" must not be used to endorse or promote products +dnl derived from this software without prior written permission. For +dnl written permission, please contact <[EMAIL PROTECTED]>. dnl dnl 5. Products derived from this software may not be called "Apache" nor may dnl "Apache" appear in their names without prior written permission of the @@ -55,38 +55,44 @@ dnl dnl ========================================================================= -dnl ------------------------------------------------------------------------- -dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -dnl Version $Id: apjava.m4,v 1.4 2001/08/01 17:14:29 pier Exp $ -dnl ------------------------------------------------------------------------- +dnl -------------------------------------------------------------------------- +dnl Author Pier Fumagalli <[EMAIL PROTECTED]> +dnl Version $Id: apjava.m4,v 1.5 2001/08/06 17:59:49 pier Exp $ +dnl -------------------------------------------------------------------------- AC_DEFUN([AP_PROG_JAVAC_WORKS],[ - AC_CACHE_CHECK([wether the Java compiler ($JAVAC) works],ap_cv_prog_javac_works,[ + AC_CACHE_CHECK([wether the Java compiler (${JAVAC}) works], + ap_cv_prog_javac_works,[ echo "public class Test {}" > Test.java - $JAVAC $JAVACFLAGS Test.java > /dev/null 2>&1 - if ${test} $? -eq 0 + ${JAVAC} ${JAVACFLAGS} Test.java > /dev/null 2>&1 + if ${TEST} ${?} -eq 0 then rm -f Test.java Test.class ap_cv_prog_javac_works=yes else rm -f Test.java Test.class AC_MSG_RESULT(no) - AC_MSG_ERROR([installation or configuration problem: javac cannot compile]) + AC_MSG_ERROR([${JAVAC} cannot compile]) fi ]) ]) AC_DEFUN([AP_PROG_JAVAC],[ - AC_PATH_PROG(JAVAC,javac,AC_MSG_ERROR([javac not found]),$JAVA_HOME/bin:$PATH) + AC_PATH_PROG(JAVAC,javac, + AC_MSG_ERROR([javac not found]), + ${JAVA_HOME}/bin:${PATH} + ) AP_PROG_JAVAC_WORKS() - AC_PROVIDE([$0]) + AC_PROVIDE([${0}]) AC_SUBST(JAVAC) AC_SUBST(JAVACFLAGS) ]) AC_DEFUN([AP_PROG_JAR],[ - AC_PATH_PROG(JAR,jar,AC_MSG_ERROR([jar not found]),$JAVA_HOME/bin:$PATH) - AC_PROVIDE([$0]) + AC_PATH_PROG(JAR,jar, + AC_MSG_ERROR([jar not found]), + ${JAVA_HOME}/bin:${PATH}) + AC_PROVIDE([${0}]) AC_SUBST(JAR) ]) @@ -106,7 +112,7 @@ AC_MSG_RESULT([${JAVA_HOME}]) ;; esac - if ${test} ! -d "${JAVA_HOME}" + if ${TEST} ! -d "${JAVA_HOME}" then AC_MSG_ERROR([${JAVA_HOME} is not a directory]) fi 1.3 +60 -5 jakarta-tomcat-connectors/webapp/support/buildconf.sh Index: buildconf.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/buildconf.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- buildconf.sh 2001/07/18 17:38:48 1.2 +++ buildconf.sh 2001/08/06 17:59:49 1.3 @@ -1,11 +1,66 @@ #!/bin/sh +# ========================================================================= # +# # +# The Apache Software License, Version 1.1 # +# # +# Copyright (c) 1999-2001 The Apache Software Foundation. # +# All rights reserved. # +# # +# ========================================================================= # +# # +# Redistribution and use in source and binary forms, with or without modi- # +# fication, are permitted provided that the following conditions are met: # +# # +# 1. Redistributions of source code must retain the above copyright notice # +# notice, this list of conditions and the following disclaimer. # +# # +# 2. Redistributions in binary form must reproduce the above copyright # +# notice, this list of conditions and the following disclaimer in the # +# documentation and/or other materials provided with the distribution. # +# # +# 3. The end-user documentation included with the redistribution, if any, # +# must include the following acknowlegement: # +# # +# "This product includes software developed by the Apache Software # +# Foundation <http://www.apache.org/>." # +# # +# Alternately, this acknowlegement may appear in the software itself, if # +# and wherever such third-party acknowlegements normally appear. # +# # +# 4. The names "The Jakarta Project", "Apache WebApp Module", and "Apache # +# Software Foundation" must not be used to endorse or promote products # +# derived from this software without prior written permission. For # +# written permission, please contact <[EMAIL PROTECTED]>. # +# # +# 5. Products derived from this software may not be called "Apache" nor may # +# "Apache" appear in their names without prior written permission of the # +# Apache Software Foundation. # +# # +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES # +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY # +# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL # +# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY # +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, # +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # +# POSSIBILITY OF SUCH DAMAGE. # +# # +# ========================================================================= # +# # +# This software consists of voluntary contributions made by many indivi- # +# duals on behalf of the Apache Software Foundation. For more information # +# on the Apache Software Foundation, please see <http://www.apache.org/>. # +# # +# ========================================================================= # +# ------------------------------------------------------------------------- # +# Author Pier Fumagalli <[EMAIL PROTECTED]> # Author Jon S. Stevens <[EMAIL PROTECTED]> -# Author Pier Fumagalli <[EMAIL PROTECTED]> -# -# This script is used to build the "configure" script from -# the "configure.in". If you check these sources out of CVS, -# you will need to execute this script first. +# Version $Id: buildconf.sh,v 1.3 2001/08/06 17:59:49 pier Exp $ +# ------------------------------------------------------------------------- # if [ ! -f ./configure.in ] then 1.1 jakarta-tomcat-connectors/webapp/support/aplocal.m4 Index: aplocal.m4 =================================================================== dnl ========================================================================= dnl dnl The Apache Software License, Version 1.1 dnl dnl Copyright (c) 1999-2001 The Apache Software Foundation. dnl All rights reserved. dnl dnl ========================================================================= dnl dnl Redistribution and use in source and binary forms, with or without modi- dnl fication, are permitted provided that the following conditions are met: dnl dnl 1. Redistributions of source code must retain the above copyright notice dnl notice, this list of conditions and the following disclaimer. dnl dnl 2. Redistributions in binary form must reproduce the above copyright dnl notice, this list of conditions and the following disclaimer in the dnl documentation and/or other materials provided with the distribution. dnl dnl 3. The end-user documentation included with the redistribution, if any, dnl must include the following acknowlegement: dnl dnl "This product includes software developed by the Apache Software dnl Foundation <http://www.apache.org/>." dnl dnl Alternately, this acknowlegement may appear in the software itself, if dnl and wherever such third-party acknowlegements normally appear. dnl dnl 4. The names "The Jakarta Project", "Apache WebApp Module", and "Apache dnl Software Foundation" must not be used to endorse or promote products dnl derived from this software without prior written permission. For dnl written permission, please contact <[EMAIL PROTECTED]>. dnl dnl 5. Products derived from this software may not be called "Apache" nor may dnl "Apache" appear in their names without prior written permission of the dnl Apache Software Foundation. dnl dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE dnl POSSIBILITY OF SUCH DAMAGE. dnl dnl ========================================================================= dnl dnl This software consists of voluntary contributions made by many indivi- dnl duals on behalf of the Apache Software Foundation. For more information dnl on the Apache Software Foundation, please see <http://www.apache.org/>. dnl dnl ========================================================================= dnl -------------------------------------------------------------------------- dnl Author Pier Fumagalli <[EMAIL PROTECTED]> dnl Version $Id: aplocal.m4,v 1.1 2001/08/06 17:59:49 pier Exp $ dnl -------------------------------------------------------------------------- AC_DEFUN(LOCAL_INIT,[ AC_MSG_RESULT([]) AC_MSG_RESULT([Initializing]) ac_t=" " AC_PATH_PROG(TEST,test,${PATH}) AC_PATH_PROG(TRUE,true,${PATH}) AC_PATH_PROG(ECHO,echo,${PATH}) AC_PATH_PROG(GREP,grep,${PATH}) AC_PATH_PROG(CAT,cat,${PATH}) AC_PATH_PROG(SED,sed,${PATH}) AC_PATH_PROG(RM,rm,${PATH}) AC_SUBST(TEST) AC_SUBST(TRUE) AC_SUBST(ECHO) AC_SUBST(GREP) AC_SUBST(CAT) AC_SUBST(SED) AC_SUBST(RM) ]) AC_DEFUN(LOCAL_HEADER,[ ${ECHO} "" ${ECHO} "${1}" 1>&2 ]) AC_DEFUN(LOCAL_FILTEREXEC,[ ${ECHO} " Invoking: ${1}" ${ECHO} "-1" > retvalue.tmp { ${1} ${ECHO} retvalue ${?} }|{ ret=0 while ${TRUE} do read first line if ${TEST} ! "${?}" -eq "0" then break else if ${TEST} "${first}" = "retvalue" then ret="${line}" else ${ECHO} " ${2}: ${first} ${line}" fi fi done unset first unset line echo "${ret}" > retvalue.tmp } ret=`${CAT} retvalue.tmp` ${RM} retvalue.tmp ${ECHO} " Execution of ${1} returned ${ret}" ])
