cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
jfclere 2002/09/03 03:15:52 Modified:webapp/support wa_apr.m4 Log: use --link-libtool instead of --apr-la-file: --apr-la-file tests is the .la file exist and if not it returns . Revision ChangesPath 1.7 +5 -5 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wa_apr.m4 30 Aug 2002 14:15:06 - 1.6 +++ wa_apr.m4 3 Sep 2002 10:15:52 - 1.7 @@ -133,9 +133,9 @@ if test ! -f $2/apr-config ; then WA_ERROR([cannot find apr-config file in $2]) fi -wa_apr_get_tempval=`$2/apr-config --apr-la-file 2 /dev/null` +wa_apr_get_tempval=`$2/apr-config --link-libtool 2 /dev/null` if test -z ${wa_apr_get_tempval} ; then - WA_ERROR([$2/apr-config --apr-la-file failed]) + WA_ERROR([$2/apr-config --link-libtool failed]) fi wa_apr_get_tempval=`basename ${wa_apr_get_tempval} | sed 's/lib//g'` wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/\.la//g'` @@ -157,9 +157,9 @@ if test ! -f $2/apr-config ; then WA_ERROR([cannot find apr-config file in $2]) fi -wa_apr_get_tempval=`$2/apr-config --apr-la-file 2 /dev/null` +wa_apr_get_tempval=`$2/apr-config --link-libtool 2 /dev/null` if test -z ${wa_apr_get_tempval} ; then - WA_ERROR([$2/apr-config --apr-la-file failed]) + WA_ERROR([$2/apr-config --link-libtool failed]) fi wa_apr_get_tempval=`basename ${wa_apr_get_tempval}` WA_APPEND([$1],[${wa_apr_get_tempval}]) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
jfclere 2002/08/30 07:15:06 Modified:webapp Makedefs.in Makefile.in configure.in webapp/apache-1.3 Makefile.in webapp/support wa_apr.m4 Log: Arrange to allow to use the released version of APR. Revision ChangesPath 1.22 +5 -1 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makedefs.in 14 May 2002 22:06:20 - 1.21 +++ Makedefs.in 30 Aug 2002 14:15:06 - 1.22 @@ -80,6 +80,10 @@ EXTRA_LDFLAGS = @EXTRA_LDFLAGS@ EXTRA_INCLUDES = @EXTRA_INCLUDES@ +# apr library name +APR_LIBNAME = @APR_LIBNAME@ +APR_LIB = @APR_LIB@ + # Module to build MODULE = @MODULE@ 1.37 +2 -2 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Makefile.in 14 May 2002 22:37:15 - 1.36 +++ Makefile.in 30 Aug 2002 14:15:06 - 1.37 @@ -132,7 +132,7 @@ apr-build: $(LIB_DIR) @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=all subdir $(LIBTOOL) --mode=install \ - cp $(APR_DIR)/libapr.la $(LIB_DIR)/libapr.la + cp $(APR_DIR)/$(APR_LIBNAME) $(LIB_DIR)/$(APR_LIBNAME) $(LIBTOOL) --mode=finish $(LIB_DIR) apr-clean: 1.63 +10 -5 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- configure.in 14 May 2002 22:37:15 - 1.62 +++ configure.in 30 Aug 2002 14:15:06 - 1.63 @@ -93,6 +93,8 @@ dnl Directories locations are defined here dnl -- WA_VARIABLE([APR_DIR]) +WA_VARIABLE([APR_LIB]) +WA_VARIABLE([APR_LIBNAME]) WA_VARIABLE([SRC_DIR]) WA_VARIABLE([TGT_DIR]) WA_VARIABLE([TC4_DIR]) @@ -179,12 +181,15 @@ WA_APR_GET([CPP],[${APR_DIR}],[CPP]) WA_APR_GET([SHELL],[${APR_DIR}],[SHELL]) -WA_APR_GET([CFLAGS],[${APR_DIR}],[EXTRA_CFLAGS]) -WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_CPPFLAGS]) -WA_APR_GET([LDFLAGS],[${APR_DIR}],[EXTRA_LDFLAGS]) +WA_APR_GET([CFLAGS],[${APR_DIR}],[CFLAGS]) +WA_APR_GET([CPPFLAGS],[${APR_DIR}],[CPPFLAGS]) +WA_APR_GET([LDFLAGS],[${APR_DIR}],[LDFLAGS]) -WA_APR_GET([LDFLAGS],[${APR_DIR}],[EXTRA_LIBS]) +WA_APR_GET([LDFLAGS],[${APR_DIR}],[LIBS]) WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_INCLUDES]) + +WA_APR_LIB([APR_LIB],[${APR_DIR}]) +WA_APR_LIBNAME([APR_LIBNAME],[${APR_DIR}]) AC_MSG_CHECKING([for apr headers]) WA_APPEND([INCLUDES],[-I${APR_DIR}/include]) 1.29 +3 -3 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile.in 13 May 2002 23:25:09 - 1.28 +++ Makefile.in 30 Aug 2002 14:15:06 - 1.29 @@ -85,7 +85,7 @@ $(INCLUDES) $(LOCAL_INCLUDES) \ -Wc,$(CPPFLAGS) $(CFLAGS) \ -Wl,$(LDFLAGS) $(LIBS) \ - -L$(LIB_DIR) -lapr \ + -L$(LIB_DIR) -l$(APR_LIB) \ $(OBJ_DIR)/*.o $ # +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++ @@ -100,4 +100,4 @@ #$(CFLAGS) $(EXTRA_CFLAGS) # # $(MODFILE): $(OBJECT) -#$(APXS) -c -o $@ -L$(OBJ_DIR) -lapr $ $(OBJ_DIR)/*.o +#$(APXS) -c -o $@ -L$(OBJ_DIR) -l$(APR_LIB) $ $(OBJ_DIR)/*.o 1.6 +54 -6 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wa_apr.m4 13 May 2002 23:23:19 - 1.5 +++ wa_apr.m4 30 Aug 2002 14:15:06 - 1.6 @@ -100,18 +100,18 @@ dnl Retrieve a value from the configured APR source tree dnl $1 = Environment variable name for the returned value dnl $2 = APR sources directory as returned by WA_APR -dnl $3 = APR variable name (found in $2/APRVARS) +dnl $3 = APR variable name (found in $2/apr-config) dnl
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4 wa_apxs.m4
pier02/05/13 16:23:19 Modified:webapp/support wa_apr.m4 wa_apxs.m4 Log: Beautification. Revision ChangesPath 1.5 +2 -2 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wa_apr.m4 3 May 2002 16:11:22 - 1.4 +++ wa_apr.m4 13 May 2002 23:23:19 - 1.5 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apr.m4,v 1.4 2002/05/03 16:11:22 pier Exp $ +dnl Version $Id: wa_apr.m4,v 1.5 2002/05/13 23:23:19 pier Exp $ dnl -- dnl -- @@ -76,7 +76,7 @@ AC_MSG_CHECKING([for apr sources]) AC_ARG_WITH( [apr], - [ --with-apr[[=apr]]the Apache Portable Runtime library to use.], + [ --with-apr[[=apr]]the Apache Portable Runtime library to use], [ case ${withval} in |yes|YES|true|TRUE) 1.7 +2 -2 jakarta-tomcat-connectors/webapp/support/wa_apxs.m4 Index: wa_apxs.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apxs.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wa_apxs.m43 May 2002 09:38:52 - 1.6 +++ wa_apxs.m413 May 2002 23:23:19 - 1.7 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apxs.m4,v 1.6 2002/05/03 09:38:52 pier Exp $ +dnl Version $Id: wa_apxs.m4,v 1.7 2002/05/13 23:23:19 pier Exp $ dnl -- dnl -- @@ -72,7 +72,7 @@ AC_MSG_CHECKING([for apxs name]) AC_ARG_WITH( [apxs], - [ --with-apxs[[=apxs]] the Apache apxs utility to use.], + [ --with-apxs[[=apxs]] the Apache APXS utility to use], [ case ${withval} in |yes|YES|true|TRUE) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
pier02/05/03 09:11:22 Modified:webapp/support wa_apr.m4 Log: The default location of the APR directory is actually relative to ${srcdir} if this is defined. Revision ChangesPath 1.4 +6 -2 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wa_apr.m4 1 May 2002 20:58:36 - 1.3 +++ wa_apr.m4 3 May 2002 16:11:22 - 1.4 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apr.m4,v 1.3 2002/05/01 20:58:36 pier Exp $ +dnl Version $Id: wa_apr.m4,v 1.4 2002/05/03 16:11:22 pier Exp $ dnl -- dnl -- @@ -68,7 +68,11 @@ AC_DEFUN( [WA_APR], [ -wa_apr_tempval=apr +if test -z ${srcdir} ; then + wa_apr_tempval=apr +else + wa_apr_tempval=${srcdir}/apr +fi AC_MSG_CHECKING([for apr sources]) AC_ARG_WITH( [apr], -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
pier02/05/01 11:09:17 Modified:webapp/support wa_apr.m4 Log: Some more variable localization, now WA_APR_GET appends data to the variable instead of replacing it, and removed a little useless check in WA_APR (WA_PATH_DIR already exits if the directory is not found) Revision ChangesPath 1.2 +17 -16jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wa_apr.m4 1 May 2002 00:19:18 - 1.1 +++ wa_apr.m4 1 May 2002 18:09:17 - 1.2 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apr.m4,v 1.1 2002/05/01 00:19:18 pier Exp $ +dnl Version $Id: wa_apr.m4,v 1.2 2002/05/01 18:09:17 pier Exp $ dnl -- dnl -- @@ -68,7 +68,7 @@ AC_DEFUN( [WA_APR], [ -tempval=apr +wa_apr_tempval=apr AC_MSG_CHECKING([for apr sources]) AC_ARG_WITH( [apr], @@ -81,19 +81,14 @@ WA_ERROR([apr library sources required for compilation]) ;; *) - tempval=${withval} + wa_apr_tempval=${withval} ;; esac ]) -AC_MSG_RESULT([${tempval}]) -WA_PATH_DIR($1,[${tempval}],[apr sources]) +AC_MSG_RESULT([${wa_apr_tempval}]) +WA_PATH_DIR($1,[${wa_apr_tempval}],[apr sources]) -if test -z $1 ; then - AC_MSG_ERROR([cannot find apr directory ${tempval}]) - exit 1 -fi -unset tempval -AC_SUBST($1) +unset wa_apr_tempval ]) dnl -- @@ -110,11 +105,17 @@ if test ! -f $2/APRVARS ; then WA_ERROR([cannot find APRVARS file in $2]) fi -$1=`cat $2/APRVARS | grep $3= 2 /dev/null` -if test -z $1 ; then +wa_apr_get_tempval=`cat $2/APRVARS | grep ^$3= 2 /dev/null` +if test -z ${wa_apr_get_tempval} ; then WA_ERROR([value for $3 not specified in $2/APRVARS]) fi -$1=`echo [$]$1 | sed 's/^$3=//g' | sed 's/$//g'` -AC_MSG_RESULT([[$]$1]) -AC_SUBST([$1]) +wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/^$3=//g'` +wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/$//g'` +if test -z ${$1} ; then + $1=${wa_apr_get_tempval} +else + $1=${$1} ${wa_apr_get_tempval} +fi +AC_MSG_RESULT([${wa_apr_get_tempval}]) +unset wa_apr_get_tempval ]) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4 wa_apxs.m4 wa_util.m4
pier02/05/01 13:58:37 Modified:webapp/support wa_apr.m4 wa_apxs.m4 wa_util.m4 Log: Added function to append value to environment variable. Revision ChangesPath 1.3 +2 -6 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wa_apr.m4 1 May 2002 18:09:17 - 1.2 +++ wa_apr.m4 1 May 2002 20:58:36 - 1.3 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apr.m4,v 1.2 2002/05/01 18:09:17 pier Exp $ +dnl Version $Id: wa_apr.m4,v 1.3 2002/05/01 20:58:36 pier Exp $ dnl -- dnl -- @@ -111,11 +111,7 @@ fi wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/^$3=//g'` wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/$//g'` -if test -z ${$1} ; then - $1=${wa_apr_get_tempval} -else - $1=${$1} ${wa_apr_get_tempval} -fi +WA_APPEND([$1],[${wa_apr_get_tempval}]) AC_MSG_RESULT([${wa_apr_get_tempval}]) unset wa_apr_get_tempval ]) 1.5 +2 -6 jakarta-tomcat-connectors/webapp/support/wa_apxs.m4 Index: wa_apxs.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apxs.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wa_apxs.m41 May 2002 18:19:42 - 1.4 +++ wa_apxs.m41 May 2002 20:58:36 - 1.5 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_apxs.m4,v 1.4 2002/05/01 18:19:42 pier Exp $ +dnl Version $Id: wa_apxs.m4,v 1.5 2002/05/01 20:58:36 pier Exp $ dnl -- dnl -- @@ -151,10 +151,6 @@ WA_ERROR([cannot execute $2]) fi AC_MSG_RESULT([${wa_apxs_get_tempval}]) -if test -z ${$1} ; then - $1=${wa_apxs_get_tempval} -else - $1=${$1} ${wa_apxs_get_tempval} -fi +WA_APPEND([$1],[${wa_apxs_get_tempval}]) unset wa_apxs_get_tempval ]) 1.4 +20 -1 jakarta-tomcat-connectors/webapp/support/wa_util.m4 Index: wa_util.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_util.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wa_util.m41 May 2002 18:05:37 - 1.3 +++ wa_util.m41 May 2002 20:58:36 - 1.4 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: wa_util.m4,v 1.3 2002/05/01 18:05:37 pier Exp $ +dnl Version $Id: wa_util.m4,v 1.4 2002/05/01 20:58:36 pier Exp $ dnl -- dnl -- @@ -83,6 +83,25 @@ [ $1= AC_SUBST([$1]) + ]) + +dnl -- +dnl WA_APPEND +dnl Append the extra value to the variable specified +dnl $1 = The environment variable name. +dnl $2 = The extra value +dnl -- +AC_DEFUN( + [WA_APPEND], + [ +wa_append_tempval=`echo $2` +if test -n ${wa_append_tempval} ; then + if test -z ${$1} ; then +$1=${wa_append_tempval} + else +$1=${$1} ${wa_append_tempval} + fi +fi ]) dnl -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4
pier02/04/30 17:19:18 Added: webapp/support wa_apr.m4 Log: Added M4 definitions to handle building APR from sources. Revision ChangesPath 1.1 jakarta-tomcat-connectors/webapp/support/wa_apr.m4 Index: wa_apr.m4 === dnl = dnl dnl The Apache Software License, Version 1.1 dnl dnl Copyright (c) 1999-2001 The Apache Software Foundation. dnlAll 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 dnlThis 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: wa_apr.m4,v 1.1 2002/05/01 00:19:18 pier Exp $ dnl -- dnl -- dnl WA_APR dnl Locate the Apache APR source directory. dnl $1 = Environment variable name where the APR directory will be stored dnl -- AC_DEFUN( [WA_APR], [ tempval=apr AC_MSG_CHECKING([for apr sources]) AC_ARG_WITH( [apr], [ --with-apr[[=apr]]the Apache Portable Runtime library to use.], [ case ${withval} in |yes|YES|true|TRUE) ;; no|NO|false|FALSE) WA_ERROR([apr library sources required for compilation]) ;; *) tempval=${withval} ;; esac ]) AC_MSG_RESULT([${tempval}]) WA_PATH_DIR($1,[${tempval}],[apr sources]) if test -z $1 ; then AC_MSG_ERROR([cannot find apr directory ${tempval}]) exit 1 fi unset tempval AC_SUBST($1) ]) dnl -- dnl WA_APR_GET dnl Retrieve a value from the configured APR source tree dnl $1 = Environment