cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-14 Thread pier 

pier02/05/14 14:50:48

  Modified:webapp   configure.in
  Log:
  Aesthetic changes (headers)
  More intelligent comments
  Added --enable-api-c
  
  Revision  ChangesPath
  1.61  +124 -23   jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- configure.in  14 May 2002 00:21:17 -  1.60
  +++ configure.in  14 May 2002 21:50:48 -  1.61
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.60 2002/05/14 00:21:17 pier Exp $
  +dnl Version $Id: configure.in,v 1.61 2002/05/14 21:50:48 pier Exp $
   dnl 
   dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
   dnl   out the last argument of the function with an extra newline.
  @@ -69,6 +69,7 @@
   sinclude(./support/wa_apr.m4)
   sinclude(./support/wa_apxs.m4)
   sinclude(./support/wa_ant.m4)
  +sinclude(./support/wa_perl.m4)
   
   dnl --
   dnl Initialize GNU Autoconf (note, this requires autoconf vers. = 2.52)
  @@ -76,14 +77,19 @@
   AC_INIT([WebApp Module],[],[http://nagoya.apache.org/bugzilla])
   AC_CONFIG_SRCDIR([configure.in])
   AC_CONFIG_AUX_DIR([support])
  -AC_CANONICAL_HOST()
   
   dnl --
   dnl Get rid of all that --prefix ... --xxxdir in the help message
   dnl --
  +WA_HEADER([Configuring AC_PACKAGE_STRING])
   WA_HELP()
   
   dnl --
  +dnl What are we compiling for
  +dnl --
  +AC_CANONICAL_HOST()
  +
  +dnl --
   dnl Directories locations are defined here
   dnl --
   WA_VARIABLE([APR_DIR])
  @@ -102,6 +108,7 @@
   WA_VARIABLE([LIBTOOL])
   WA_VARIABLE([APXS])
   WA_VARIABLE([ANT])
  +WA_VARIABLE([PERL])
   
   WA_VARIABLE([CPPFLAGS])
   WA_VARIABLE([CFLAGS])
  @@ -125,26 +132,24 @@
   HOST=${host}
   DATE=`date`
   
  -WA_VARIABLE([ENABLE_JAVA])
  -WA_VARIABLE([ENABLE_DOCS])
  -WA_VARIABLE([ENABLE_APIJ])
  +WA_VARIABLE([ANT_TARGETS])
   
   dnl --
   dnl Figure out if we have APXS, where it's located, and what version it is
   dnl --
  +WA_HEADER([Checking Apache APXS])
   WA_APXS([APXS])
   WA_APXS_CHECK([APXS_VERSION],[${APXS}])
   
   dnl --
   dnl Decide based on what version of APXS we found
   dnl --
  -AC_MSG_CHECKING([for apr location])
   if test ${APXS_VERSION} = 1.3 ; then
   
   dnl --
   dnl APXS version 1.3, meaning Apache 1.3. We _require_ APR sources
   dnl --
  -AC_MSG_RESULT([local sources])
  +WA_HEADER([Apache 1.3 module compilation (APR checks)])
   
   dnl --
   dnl Check where the APR sources are and issue configure
  @@ -190,6 +195,11 @@
   AC_MSG_RESULT([${LIBTOOL}])
   
   dnl --
  +dnl Done with APR, let's see what APXS says
  +dnl --
  +WA_HEADER([Apache 1.3 module compilation (APXS checks)])
  +
  +dnl --
   dnl Do a check on the C compiler to see if apxs reports the same one
   dnl --
   WA_APXS_GET([tempval],[${APXS}],[CC])
  @@ -226,7 +236,7 @@
   dnl --
   dnl APXS version 2.0, meaning Apache 2.0. We use APR from there
   dnl --
  -AC_MSG_RESULT([apache 2 distribution])
  +WA_HEADER([Apache 2.0 module])
   
   WA_APXS_GET([CC],[${APXS}],[CC])
   WA_APXS_GET([CPP],[${APXS}],[CPP])
  @@ -257,18 +267,25 @@
   dnl --

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-13 Thread pier 

pier02/05/13 16:27:44

  Modified:webapp   configure.in
  Log:
  Add ANT support to configure. Note that this is still not reflected
  into the makefiles as of today (will fix it later tomorrow night if
  I get around to do it).
  
  Revision  ChangesPath
  1.59  +54 -3 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- configure.in  3 May 2002 16:17:55 -   1.58
  +++ configure.in  13 May 2002 23:27:43 -  1.59
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.58 2002/05/03 16:17:55 pier Exp $
  +dnl Version $Id: configure.in,v 1.59 2002/05/13 23:27:43 pier Exp $
   dnl 
   dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
   dnl   out the last argument of the function with an extra newline.
  @@ -68,6 +68,7 @@
   sinclude(./support/wa_version.m4)
   sinclude(./support/wa_apr.m4)
   sinclude(./support/wa_apxs.m4)
  +sinclude(./support/wa_ant.m4)
   
   dnl --
   dnl Initialize GNU Autoconf (note, this requires autoconf vers. = 2.52)
  @@ -77,7 +78,6 @@
   AC_CONFIG_AUX_DIR([support])
   AC_CANONICAL_HOST()
   
  -
   dnl --
   dnl Get rid of all that --prefix ... --xxxdir in the help message
   dnl --
  @@ -89,6 +89,7 @@
   WA_VARIABLE([APR_DIR])
   WA_VARIABLE([SRC_DIR])
   WA_VARIABLE([TGT_DIR])
  +WA_VARIABLE([TC4_DIR])
   WA_PATH_DIR([SRC_DIR],[${srcdir}],[sources])
   WA_PATH_DIR([TGT_DIR],[.],[build])
   
  @@ -100,6 +101,7 @@
   WA_VARIABLE([SHELL])
   WA_VARIABLE([LIBTOOL])
   WA_VARIABLE([APXS])
  +WA_VARIABLE([ANT])
   
   WA_VARIABLE([CPPFLAGS])
   WA_VARIABLE([CFLAGS])
  @@ -123,6 +125,10 @@
   HOST=${host}
   DATE=`date`
   
  +WA_VARIABLE([ENABLE_JAVA])
  +WA_VARIABLE([ENABLE_DOCS])
  +WA_VARIABLE([ENABLE_APIJ])
  +
   dnl --
   dnl Figure out if we have APXS, where it's located, and what version it is
   dnl --
  @@ -255,6 +261,51 @@
   WA_VERSION([WEBAPP_VERSION],[${CC}])
   
   dnl --
  +dnl Java Tips and Tricks
  +dnl --
  +WA_ANT([ANT])
  +
  +AC_MSG_CHECKING([for java compilation])
  +AC_ARG_ENABLE(
  +[java],
  +[  --enable-java[[=tc4dir]]  compile java code (tc4dir must be specifed)],
  +[
  +case ${enableval} in
  +|yes|YES|true|TRUE)
  +WA_ERROR([Path of Tomcat 4.0 binary distribution unspecified])
  +;;
  +no|NO|false|FALSE)
  +AC_MSG_RESULT([no])
  +ENABLE_JAVA=
  +;;
  +*)
  +AC_MSG_RESULT([yes])
  +ENABLE_JAVA=compile
  +WA_PATH_DIR([TC4_DIR],[${enableval}],[tomcat 4.0 distribution])
  +AC_MSG_CHECKING([for proper tomcat layout])
  +if test ! -f ${TC4_DIR}/server/lib/catalina.jar ; then
  +  WA_ERROR([cannot find ${TC4_DIR}/server/lib/catalina.jar])
  +fi
  +if test ! -f ${TC4_DIR}/common/lib/servlet.jar ; then
  +  WA_ERROR([cannot find ${TC4_DIR}/common/lib/servlet.jar])
  +fi
  +AC_MSG_RESULT([ok])
  +;;
  +esac
  +],[
  +AC_MSG_RESULT([no])
  +ENABLE_JAVA=
  +])
  +
  +dnl --
   dnl All done
   dnl --
  -AC_OUTPUT([Makedefs Makefile lib/Makefile ${MODULE}/Makefile DETAILS.txt])
  +AC_OUTPUT(
  +  [
  +Makedefs
  +Makefile
  +lib/Makefile
  +${MODULE}/Makefile
  +DETAILS.txt
  +build.properties
  +  ])
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-13 Thread pier 

pier02/05/13 17:21:17

  Modified:webapp   configure.in
  Log:
  Simplify --enable-java, add targets for --enable-docs and --enable-apidoc-java
  
  Revision  ChangesPath
  1.60  +67 -0 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- configure.in  13 May 2002 23:27:43 -  1.59
  +++ configure.in  14 May 2002 00:21:17 -  1.60
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.59 2002/05/13 23:27:43 pier Exp $
  +dnl Version $Id: configure.in,v 1.60 2002/05/14 00:21:17 pier Exp $
   dnl 
   dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
   dnl   out the last argument of the function with an extra newline.
  @@ -264,6 +264,10 @@
   dnl Java Tips and Tricks
   dnl --
   WA_ANT([ANT])
  +if test -n ${ANT} ; then
  +WA_APPEND([EXTRA_BUILD],[ant-build])
  +dnlWA_APPEND([EXTRA_CLEAN],[ant-clean])
  +fi
   
   AC_MSG_CHECKING([for java compilation])
   AC_ARG_ENABLE(
  @@ -279,6 +283,9 @@
   ENABLE_JAVA=
   ;;
   *)
  +if test -z ${ANT} ; then
  +WA_ERROR([java compilation desired but ANT not found])
  +fi
   AC_MSG_RESULT([yes])
   ENABLE_JAVA=compile
   WA_PATH_DIR([TC4_DIR],[${enableval}],[tomcat 4.0 distribution])
  @@ -295,6 +302,66 @@
   ],[
   AC_MSG_RESULT([no])
   ENABLE_JAVA=
  +])
  +
  +AC_MSG_CHECKING([for documentation generation])
  +AC_ARG_ENABLE(
  +[docs],
  +[  --enable-docs   generate documentation (requires ANT)],
  +[
  +case ${enableval} in
  +|yes|YES|true|TRUE)
  +if test -z ${ANT} ; then
  +WA_ERROR([docs generation desired but ANT not found])
  +fi
  +AC_MSG_RESULT([yes])
  +ENABLE_DOCS=docs
  +;;
  +no|NO|false|FALSE)
  +AC_MSG_RESULT([no])
  +ENABLE_DOCS=
  +;;
  +*)
  +WA_ERROR([invalid parameter --enable-docs=${enableval}])
  +;;
  +esac
  +],[
  +if test -z ${ANT} ; then
  +AC_MSG_RESULT([no (ant required)])
  +else
  +AC_MSG_RESULT([yes (ant detected)])
  +ENABLE_DOCS=docs
  +fi
  +])
  +
  +AC_MSG_CHECKING([for Java API docs generation])
  +AC_ARG_ENABLE(
  +[apidoc-java],
  +[  --enable-apidoc-javagenerate Java API docs (requires ANT)],
  +[
  +case ${enableval} in
  +|yes|YES|true|TRUE)
  +if test -z ${ANT} ; then
  +WA_ERROR([docs generation desired but ANT not found])
  +fi
  +AC_MSG_RESULT([yes])
  +ENABLE_APIJ=javadoc
  +;;
  +no|NO|false|FALSE)
  +AC_MSG_RESULT([no])
  +ENABLE_APIJ=
  +;;
  +*)
  +WA_ERROR([invalid parameter --enable-apidoc-java=${enableval}])
  +;;
  +esac
  +],[
  +if test -z ${ANT} ; then
  +AC_MSG_RESULT([no (ant required)])
  +else
  +AC_MSG_RESULT([yes (ant detected)])
  +ENABLE_APIJ=javadoc
  +fi
   ])
   
   dnl --
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-03 Thread pier 

pier02/05/03 04:40:24

  Modified:webapp   configure.in
  Log:
  Undo my patch of this morning to get versions out of the VERSION file
  
  Revision  ChangesPath
  1.56  +2 -13 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- configure.in  3 May 2002 09:40:39 -   1.55
  +++ configure.in  3 May 2002 11:40:24 -   1.56
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.55 2002/05/03 09:40:39 pier Exp $
  +dnl Version $Id: configure.in,v 1.56 2002/05/03 11:40:24 pier Exp $
   dnl 
   dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
   dnl   out the last argument of the function with an extra newline.
  @@ -72,7 +72,7 @@
   dnl Initialize GNU Autoconf (note, this requires autoconf vers. = 2.52)
   dnl --
   AC_INIT([WebApp Module],[],[http://nagoya.apache.org/bugzilla])
  -AC_CONFIG_SRCDIR([VERSION])
  +AC_CONFIG_SRCDIR([configure.in])
   
   dnl --
   dnl Get rid of all that --prefix ... --xxxdir in the help message
  @@ -110,12 +110,6 @@
   WA_VARIABLE([EXTRA_BUILD])
   WA_VARIABLE([EXTRA_CLEAN])
   
  -WA_VARIABLE([APACHE_VERSION])
  -WA_VARIABLE([WEBAPP_VERSION])
  -AC_MSG_CHECKING([for version])
  -WEBAPP_VERSION=`cat ${SRC_DIR}/VERSION`
  -AC_MSG_RESULT([${WEBAPP_VERSION}])
  -
   WA_VARIABLE([MODULE])
   
   dnl --
  @@ -242,11 +236,6 @@
   
   MODULE=apache-2.0
   fi
  -
  -dnl --
  -dnl Get some informations about the server
  -dnl --
  -WA_APXS_SERVER([APACHE_VERSION],[${APXS}])
   
   dnl --
   dnl All done
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-01 Thread pier 

pier02/05/01 08:31:47

  Modified:webapp   configure.in
  Log:
  Added retrieval of environment variables to build stuff when Apache 2.0 is game.
  
  Revision  ChangesPath
  1.53  +27 -2 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- configure.in  1 May 2002 00:37:16 -   1.52
  +++ configure.in  1 May 2002 15:31:47 -   1.53
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.52 2002/05/01 00:37:16 pier Exp $
  +dnl Version $Id: configure.in,v 1.53 2002/05/01 15:31:47 pier Exp $
   dnl --
   
   sinclude(./support/wa_util.m4)
  @@ -175,8 +175,33 @@
   
   else
   
  +dnl --
  +dnl APXS version 2.0, meaning Apache 2.0. We use APR from there
  +dnl --
   AC_MSG_RESULT([apache 2 distribution])
  -AC_MSG_ERROR([using Apache 2.0 apxs will be supported shortly])
  +
  +WA_APXS_GET([CC],[${APXS}],[CC])
  +WA_APXS_GET([CPP],[${APXS}],[CPP])
  +WA_APXS_GET([SHELL],[${APXS}],[SHELL])
  +WA_APXS_GET([LIBTOOL],[${APXS}],[LIBTOOL])
  +
  +WA_APXS_GET([CPPFLAGS],[${APXS}],[CPPFLAGS])
  +WA_APXS_GET([CPPFLAGS],[${APXS}],[NOTEST_CPPFLAGS])
  +WA_APXS_GET([CPPFLAGS],[${APXS}],[EXTRA_CPPFLAGS])
  +
  +WA_APXS_GET([LDFLAGS],[${APXS}],[LDFLAGS])
  +WA_APXS_GET([LDFLAGS],[${APXS}],[NOTEST_LDFLAGS])
  +WA_APXS_GET([LDFLAGS],[${APXS}],[EXTRA_LDFLAGS])
  +
  +WA_APXS_GET([CFLAGS],[${APXS}],[CFLAGS])
  +WA_APXS_GET([CFLAGS],[${APXS}],[NOTEST_CFLAGS])
  +WA_APXS_GET([CFLAGS],[${APXS}],[EXTRA_CFLAGS])
  +
  +WA_APXS_GET([INCLUDES],[${APXS}],[INCLUDEDIR])
  +WA_PATH_DIR([INCLUDES],[${INCLUDES}],[apache 2.0 headers])
  +INCLUDES=-I${INCLUDES}
  +AC_SUBST([INCLUDES])
  +
   MODULE=apache-2.0
   fi
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2002-05-01 Thread pier 

pier02/05/01 14:27:20

  Modified:webapp   configure.in
  Log:
  Now builds modules for Apache 1.3 and Apache 2.0 correctly
  
  Revision  ChangesPath
  1.54  +68 -34jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- configure.in  1 May 2002 15:31:47 -   1.53
  +++ configure.in  1 May 2002 21:27:20 -   1.54
  @@ -57,7 +57,10 @@
   
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.53 2002/05/01 15:31:47 pier Exp $
  +dnl Version $Id: configure.in,v 1.54 2002/05/01 21:27:20 pier Exp $
  +dnl 
  +dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
  +dnl   out the last argument of the function with an extra newline.
   dnl --
   
   sinclude(./support/wa_util.m4)
  @@ -77,7 +80,16 @@
   WA_HELP()
   
   dnl --
  -dnl Define and zero the variables we need in Makedefs.in
  +dnl Directories locations are defined here
  +dnl --
  +WA_VARIABLE([APR_DIR])
  +WA_VARIABLE([SRC_DIR])
  +WA_VARIABLE([TGT_DIR])
  +WA_PATH_DIR([SRC_DIR],[${srcdir}],[sources])
  +WA_PATH_DIR([TGT_DIR],[.],[build])
  +
  +dnl --
  +dnl Define  the variables we need in Makedefs.in
   dnl --
   WA_VARIABLE([CC])
   WA_VARIABLE([CPP])
  @@ -88,20 +100,17 @@
   WA_VARIABLE([CPPFLAGS])
   WA_VARIABLE([CFLAGS])
   WA_VARIABLE([LDFLAGS])
  -WA_VARIABLE([LIBS])
   WA_VARIABLE([INCLUDES])
  +INCLUDES=-I. -I${SRC_DIR}/include
   
  -WA_VARIABLE([MODULE])
  -
  -WA_VARIABLE([APR_DIR])
  -WA_VARIABLE([SRC_DIR])
  -WA_VARIABLE([TGT_DIR])
  -
  +WA_VARIABLE([EXTRA_CFLAGS])
  +WA_VARIABLE([EXTRA_CPPFLAGS])
  +WA_VARIABLE([EXTRA_LDFLAGS])
  +WA_VARIABLE([EXTRA_INCLUDES])
   WA_VARIABLE([EXTRA_BUILD])
   WA_VARIABLE([EXTRA_CLEAN])
   
  -WA_PATH_DIR([SRC_DIR],[${srcdir}],[sources])
  -WA_PATH_DIR([TGT_DIR],[.],[build])
  +WA_VARIABLE([MODULE])
   
   dnl --
   dnl Figure out if we have APXS, where it's located, and what version it is
  @@ -124,16 +133,22 @@
   dnl Check where the APR sources are and issue configure
   dnl --
   WA_APR([APR_DIR])
  +tempret=0
   tempval=--enable-static --disable-shared --disable-threads
  -tempval=${tempval} --libdir=${TGT_DIR}
  +tempval=${tempval} --libdir=${TGT_DIR}/objects
   WA_EXEC(
  -[tempval],
  +[tempret],
   [./configure ${tempval}],
   [apr],
   [${APR_DIR}])
  +AC_MSG_CHECKING([for proper command execution])
  +if test ${tempret} = 0 ; then
  +AC_MSG_RESULT([ok (${tempret})])
  +else
  +WA_ERROR([command returned with ${tempret}])
  +fi
  +unset tempret
   unset tempval
  -
  -dnl TODO: CHECK FOR RETURN VALUE HERE
   
   dnl --
   dnl Retrieve APR variables
  @@ -141,37 +156,53 @@
   WA_APR_GET([CC],[${APR_DIR}],[CC])
   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}],[EXTRA_CFLAGS])
  -WA_APR_GET([LIBS],[${APR_DIR}],[EXTRA_LIBS])
  -WA_APR_GET([INCLUDES],[${APR_DIR}],[EXTRA_INCLUDES])
   
  -AC_MSG_CHECKING([for apr INCLUDES variable])
  -INCLUDES=-I${APR_DIR}/include ${INCLUDES}
  -AC_SUBST([INCLUDES])
  +WA_APR_GET([LDFLAGS],[${APR_DIR}],[EXTRA_LIBS])
  +WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_INCLUDES])
  +
  +AC_MSG_CHECKING([for apr headers])
  +WA_APPEND([INCLUDES],[-I${APR_DIR}/include])
   AC_MSG_RESULT([-I${APR_DIR}/include])
   
  -AC_MSG_CHECKING([for apr LIBTOOL variable])
  +AC_MSG_CHECKING([for apr libtool])
   LIBTOOL=${SHELL} ${APR_DIR}/libtool --silent
  -AC_SUBST([LIBTOOL])
   AC_MSG_RESULT([${LIBTOOL}])
   
   dnl --
   dnl Do a check on the C compiler to see if apxs reports the same one
   dnl --
  -

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-11-23 Thread jfclere 

jfclere 01/11/23 04:12:59

  Modified:webapp   configure.in
  Log:
  Add --with-apr-lib and --with-apr-include for special httpd-2.0
  installations.
  
  Revision  ChangesPath
  1.49  +76 -4 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- configure.in  2001/11/22 11:36:21 1.48
  +++ configure.in  2001/11/23 12:12:59 1.49
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.48 2001/11/22 11:36:21 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.49 2001/11/23 12:12:59 jfclere Exp $
   dnl --
   
   dnl --
  @@ -346,6 +346,8 @@
   dnl New vars: N/A
   dnl Upd vars: APR_SRCDIR
   dnl --
  +LOCAL_HEADER([APR location])
  +AC_MSG_CHECKING([for APR sources])
   AC_ARG_WITH(apr,
 [  --with-apr[=DIR]  path of an APR (Apache Portable Runtime) source
 distribution or CVS snapshot. (DIR defaults to
  @@ -360,12 +362,62 @@
 APR_SRCDIR=${withval}
 ;;
   esac
  +AC_MSG_RESULT([${APR_SRCDIR}])
 ],[
   APR_SRCDIR=${SRCDIR}/apr
  +AC_MSG_RESULT([${APR_SRCDIR}])
 ]
   )
  +dnl --
  +dnl Process the --with-apr-lib=... command line argument
  +dnl FHS System does not have apr library installed local_prefix/lib
  +dnl but somewhere else.
  +dnl --
  +AC_MSG_CHECKING([for APR libraries])
  +AC_ARG_WITH(apr-lib,
  +  [  --with-apr-lib=DIR  path where the APR libraries are installed.],
  +  [
  +case ${withval} in
  +|yes|YES|true|TRUE)
  +  AC_MSG_ERROR([--with-apr-lib need a directory])
  +  ;;
  +*)
  +  APR_LIBDIR=${withval}
  +  ;;
  +esac
  +AC_MSG_RESULT([${APR_LIBDIR}])
  +  ],
  +  [
  +AC_MSG_RESULT([no])
  +  ]
  +)
   
   dnl --
  +dnl Process the --with-apr-include=... command line argument
  +dnl FHS System does not have apr include installed local_prefix/include
  +dnl but somewhere else.
  +dnl --
  +AC_MSG_CHECKING([for APR includes])
  +AC_ARG_WITH(apr-include,
  +  [  --with-apr-include=DIR  path where the APR includes are
  + installed.],
  +  [
  +case ${withval} in
  +|yes|YES|true|TRUE)
  +  AC_MSG_ERROR([--with-apr-include need a directory])
  +  ;;
  +*)
  +  APR_INCDIR=${withval}
  +  ;;
  +esac
  +AC_MSG_RESULT([${APR_INCDIR}])
  +  ],
  +  [
  +AC_MSG_RESULT([no])
  +  ]
  +)
  +
  +dnl --
   dnl Target module to build
   dnl --
   LOCAL_HEADER([Target web-server])
  @@ -428,9 +480,29 @@
 local_prefix=`${APXS} -q PREFIX`
 LIBTOOL=$local_prefix/build/libtool
 APR_CFGFLG=
  -  APR_VARFIL=${local_prefix}/lib/APRVARS
  -  APR_LIBDIR=${local_prefix}/lib
  -  APR_INCDIR=${local_prefix}/include
  +
  +  dnl check APR_LIBDIR
  +  if ${TEST} -z ${APR_LIBDIR}
  +  then
  +APR_VARFIL=${local_prefix}/lib/APRVARS
  +APR_LIBDIR=${local_prefix}/lib
  +  else
  +APR_VARFIL=${APR_LIBDIR}/APRVARS
  +  fi
  +
  +  dnl check APR_INCDIR
  +  if ${TEST} -z ${APR_INCDIR}
  +  then
  +APR_INCDIR=${local_prefix}/include
  +  fi
  +  if ${TEST} ! -d ${APR_LIBDIR}
  +  then
  +AC_MSG_ERROR([\${APR_LIBDIR}\ not found. Use --with-apr-lib=DIR.])
  +  fi
  +  if ${TEST} ! -d ${APR_INCDIR}
  +  then
  +AC_MSG_ERROR([\${APR_INCDIR}\ not found. Use --with-apr-include=DIR.])
  +  fi
 unset local_prefix
   else
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-11-22 Thread jfclere 

jfclere 01/11/22 03:36:21

  Modified:webapp   configure.in
  Log:
  Check LDFLAGS_SHLIB and CFLAGS of apxs, that prevents problems later.
  
  Revision  ChangesPath
  1.48  +17 -1 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- configure.in  2001/11/12 18:02:01 1.47
  +++ configure.in  2001/11/22 11:36:21 1.48
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.47 2001/11/12 18:02:01 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.48 2001/11/22 11:36:21 jfclere Exp $
   dnl --
   
   dnl --
  @@ -446,6 +446,22 @@
 APR_VARFIL=
 APR_LIBDIR=
 APR_INCDIR=
  +
  +  dnl -
  +  dnl check for broken APXS (Apachetoolbox brokes it)
  +  dnl -
  +  local_ldflags_shlib=`${APXS} -q LDFLAGS_SHLIB 21 | grep Error`
  +  if  ${TEST} -n ${local_ldflags_shlib}
  +  then
  +AC_MSG_ERROR([${APXS} is broken (LDFLAGS_SHLIB not found)])
  +  fi
  +
  +  local_cflags=`${APXS} -q CFLAGS 21 | grep Error`
  +  if  ${TEST} -n ${local_cflags}
  +  then
  +AC_MSG_ERROR([${APXS} is broken (CFLAGS not found)])
  +  fi
  +
   fi
   unset local_apache
 ],[
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-11-12 Thread jfclere 

jfclere 01/11/12 10:02:01

  Modified:webapp   configure.in
  Log:
  Prevent in configure mixing native cc and gcc on Solaris.
  In apache-1.3 it was causing unresolved __lshrdi3 when loading mod_webapp.so
  In apache-2.0 it was not compiling.
  
  Revision  ChangesPath
  1.47  +25 -1 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- configure.in  2001/11/01 22:20:51 1.46
  +++ configure.in  2001/11/12 18:02:01 1.47
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.46 2001/11/01 22:20:51 pier Exp $
  +dnl Version $Id: configure.in,v 1.47 2001/11/12 18:02:01 jfclere Exp $
   dnl --
   
   dnl --
  @@ -509,6 +509,9 @@
 APR_LIBDIR=${TGTDIR}/lib
 TARGET=${TARGET} apr
 LIBTOOL=${APR_SRCDIR}/libtool
  +  eval `${GREP} ^CC= ${APR_VARFIL} | ${SED} s/^CC=/APR_CC=/`
  +else
  +  APR_CC=${CC}  
   fi
   
   dnl --
  @@ -524,6 +527,27 @@
 AC_MSG_RESULT([error])
 AC_MSG_ERROR([Cannot find required APRVARS file])
   fi
  +
  +dnl Check that we are not mixing native and gnu compilers
  +dnl on the platfroms that do not support it.
  +
  +eval `${GREP} ^NM= ${LIBTOOL}`
  +gnu_cc=`${APR_CC} --help | ${GREP} gnu`
  +if ${TEST} ! -z ${gnu_cc}
  +then
  +  APACHE_DIR=`${APXS} -q SBINDIR`
  +  is_apache_gcc=Yes
  +  case $host in
  +sparc-sun-solaris2.8)
  +  is_apache_gcc=`${NM} ${APACHE_DIR}/httpd | ${GREP} __lshrdi3`
  +  ;;
  +  esac
  +  if ${TEST} -z ${is_apache_gcc}
  +  then
  +AC_MSG_ERROR([Cannot mix gcc and native cc])
  +  fi
  +fi
  +
   AC_MSG_RESULT([ok])
   eval `${CAT} ${APR_VARFIL} | ${GREP} EXTRA_ | ${SED} s/EXTRA_/APR_/g`
   AC_SUBST(APR_CFLAGS)
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-10-19 Thread pier 

pier01/10/19 13:03:21

  Modified:webapp   configure.in
  Log:
  Small typo in configure.in
  
  Revision  ChangesPath
  1.45  +3 -3  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- configure.in  2001/10/18 04:15:37 1.44
  +++ configure.in  2001/10/19 20:03:21 1.45
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.44 2001/10/18 04:15:37 pier Exp $
  +dnl Version $Id: configure.in,v 1.45 2001/10/19 20:03:21 pier Exp $
   dnl --
   
   dnl --
  @@ -555,8 +555,8 @@
   unset local_target
   TARGET_BUILD=${TARGET_BUILD} ${MODULE}-build
   TARGET_CLEAN=${TARGET_CLEAN} ${MODULE}-clean
  -TARGET_LBUILD=${TARGET_BUILD} ${MODULE}-build
  -TARGET_LCLEAN=${TARGET_CLEAN} ${MODULE}-clean
  +TARGET_LBUILD=${TARGET_LBUILD} ${MODULE}-build
  +TARGET_LCLEAN=${TARGET_LCLEAN} ${MODULE}-clean
   AC_MSG_RESULT([${TARGET} ${MODULE}])
   AC_SUBST(TARGET_BUILD)
   AC_SUBST(TARGET_CLEAN)

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-10-17 Thread pier 

pier01/10/17 21:15:37

  Modified:webapp   configure.in
  Log:
  Removed commented out lines.
  
  Revision  ChangesPath
  1.44  +1 -15 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- configure.in  2001/10/17 18:33:31 1.43
  +++ configure.in  2001/10/18 04:15:37 1.44
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.43 2001/10/17 18:33:31 pier Exp $
  +dnl Version $Id: configure.in,v 1.44 2001/10/18 04:15:37 pier Exp $
   dnl --
   
   dnl --
  @@ -489,20 +489,6 @@
   AC_MSG_ERROR([APR sources not found. Use --with-apr=DIR.])
 fi
 LOCAL_RESOLVEDIR(APR_SRCDIR,[${APR_SRCDIR}],[full APR directory path])
  -  
  -  dnl --
  -  dnl Build the APR configure script
  -  dnl --
  -dnl  LOCAL_HEADER([Building APR configure script])
  -dnl  LOCAL_FILTEREXEC(local_return,
  -dnl[./buildconf],
  -dnl[APR buildconf],
  -dnl[${APR_SRCDIR}])
  -
  -dnl  if ${TEST} ${local_return} -ne 0
  -dnl  then
  -dnlAC_MSG_ERROR([APR buildconf terminated with error code ${local_return}])
  -dnl  fi
 
 dnl 
 dnl Run the APR configure script

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-16 Thread pier 

pier01/09/16 17:00:32

  Modified:webapp   configure.in
  Log:
  Updated the way in wich targets are handled.
  Added new targets for API documentation.
  
  Revision  ChangesPath
  1.36  +166 -33   jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- configure.in  2001/09/16 00:30:10 1.35
  +++ configure.in  2001/09/17 00:00:32 1.36
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.35 2001/09/16 00:30:10 pier Exp $
  +dnl Version $Id: configure.in,v 1.36 2001/09/17 00:00:32 pier Exp $
   dnl --
   
   dnl --
  @@ -78,13 +78,12 @@
   dnl --
   dnl Setup initial variable value
   dnl
  -dnl New vars: MODULE TARGET_BUILD TARGET_CLEAN
  +dnl New vars: MODULE TARGET
   dnl   APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
   dnl Upd vars: N/A
   dnl --
   MODULE=
  -TARGET_BUILD=lib-build
  -TARGET_CLEAN=lib-clean
  +TARGET=lib
   APR_CFGFLG=
   APR_SRCDIR=
   APR_LIBDIR=
  @@ -92,8 +91,7 @@
   APR_VARFIL=
   
   AC_SUBST(MODULE)
  -AC_SUBST(TARGET_BUILD)
  -AC_SUBST(TARGET_CLEAN)
  +AC_SUBST(TARGET)
   AC_SUBST(APR_CFGFLG)
   AC_SUBST(APR_SRCDIR)
   AC_SUBST(APR_LIBDIR)
  @@ -149,7 +147,9 @@
 ],[
   AC_MSG_RESULT([no])
   DEBUG=false
  -  ])
  +DEXEC=
  +  ]
  +)
   AC_SUBST(DEBUG)
   
   dnl -
  @@ -178,7 +178,7 @@
 when the --enable-java option is not specified.],
 [
   case ${withval} in
  -yes|YES|true|TRUE)
  +|yes|YES|true|TRUE)
 TC4DIR=/usr/local/tomcat
 ;;
   *)
  @@ -191,13 +191,117 @@
   )
   AC_SUBST(TC4DIR)
   
  +dnl -
  +dnl Check wether we have to build the C API documentation or not
  +dnl
  +dnl New vars: PERL SCANDOC SCANDOCFLAGS
  +dnl Upd vars: TARGET
  +dnl -
  +LOCAL_HEADER([API documentation generation])
  +AC_MSG_CHECKING([for C API documentation])
  +AC_ARG_ENABLE(apidocs-c,
  +  [  --enable-apidocs-c[=PERL]
  +  enbale generation of C API documentation using
  +  ScanDoc (PERL is the name of the Perl interpreter
  +  used to run ScanDoc. If not specified this is
  +  looked up in your current path).],
  +  [
  +AC_MSG_RESULT([yes])
  +
  +AC_MSG_CHECKING([for Perl interpreter])
  +case ${enableval} in
  +|yes|YES|true|TRUE)
  +  LOCAL_CHECK_PROG(PERL,perl)
  +  ;;
  +*)
  +  PERL=${enableval}
  +  ;;
  +esac
  +
  +if ${TEST} ! -x ${PERL}
  +then
  +  AC_MSG_RESULT([error])
  +  AC_MSG_ERROR([cannot execute perl \${PERL}\])
  +fi
  +AC_MSG_RESULT([${PERL}])
  +
  +AC_MSG_CHECKING([for ScanDoc to use])
  +SCANDOC=${SRCDIR}/support/scandoc.pl
  +if ${TEST} ! -f ${SCANDOC}
  +then
  +  AC_MSG_RESULT([error])
  +  AC_MSG_ERROR([cannof find ScanDoc \${SCANDOC}\])
  +fi
  +AC_MSG_RESULT([${SCANDOC}])
  +
  +AC_MSG_CHECKING([for ScanDoc template])
  +if ${TEST} ! -f ${SRCDIR}/support/template.pl
  +then
  +  AC_MSG_RESULT([error])
  +  AC_MSG_ERROR([cannof find ScanDoc \${SRCDIR}/support/template.pl\])
  +fi
  +AC_MSG_RESULT([${SRCDIR}/support/template.pl])
  +SCANDOCFLAGS=-i ${SRCDIR}/support/template.pl
  +
  +TARGET=${TARGET} apidocs-c
  +  ],[
  +AC_MSG_RESULT([no])
  +PERL=
  +  ]
  +)
  +AC_SUBST(PERL)
  +AC_SUBST(SCANDOC)
  +AC_SUBST(SCANDOCFLAGS)
  +
  +dnl -
  +dnl Check wether we have to build the Java API documentation or not
  +dnl
  +dnl New vars: N/A
  +dnl Upd vars: JAVADOC TARGET
  +dnl -
  +AC_MSG_CHECKING([for Java API documentation])
  +AC_ARG_ENABLE(apidocs-java,
  +  [  --enable-apidocs-java[=JAVADOC]
  +  enbale generation of Java API documentation using
  +  JavaDoc (If JAVADOC is not set its value will be
  +  discovered by \--enable-java\).],
  +  [
  +

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-16 Thread pier 

pier01/09/16 22:07:01

  Modified:webapp   configure.in
  Log:
  Discover configure generated files as we process.
  
  Revision  ChangesPath
  1.39  +56 -44jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- configure.in  2001/09/17 00:42:59 1.38
  +++ configure.in  2001/09/17 05:07:01 1.39
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.38 2001/09/17 00:42:59 pier Exp $
  +dnl Version $Id: configure.in,v 1.39 2001/09/17 05:07:01 pier Exp $
   dnl --
   
   dnl --
  @@ -78,12 +78,13 @@
   dnl --
   dnl Setup initial variable value
   dnl
  -dnl New vars: MODULE TARGET
  +dnl New vars: MODULE TARGET CFGFILES
   dnl   APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
   dnl Upd vars: N/A
   dnl --
   MODULE=
   TARGET=lib
  +CFGFILES=./Makefile ./Makedefs ./lib/Makefile ./java/Constants.java
   APR_CFGFLG=
   APR_SRCDIR=
   APR_LIBDIR=
  @@ -92,6 +93,7 @@
   
   AC_SUBST(MODULE)
   AC_SUBST(TARGET)
  +AC_SUBST(CFGFILES)
   AC_SUBST(APR_CFGFLG)
   AC_SUBST(APR_SRCDIR)
   AC_SUBST(APR_LIBDIR)
  @@ -124,7 +126,9 @@
   AC_SUBST(AR)
   AC_SUBST(RANLIB)
   AC_PROG_CC()
  -LOCAL_CHECK_PROG(CC,${CC})
  +local_cc=${CC}
  +LOCAL_CHECK_PROG(CC,${local_cc})
  +unset local_cc
   AC_PROG_CC_C_O()
   AC_PROG_CPP()
   AC_SUBST(CPPFLAGS)
  @@ -191,6 +195,42 @@
   )
   AC_SUBST(TC4DIR)
   
  +dnl --
  +dnl Check that we can build all classes depending on Tomcat if Java is enabled
  +dnl
  +dnl New vars: CLASSPATH
  +dnl Upd vars: TC4DIR TARGET CFGFILES
  +dnl --
  +if ${TEST} $JAVA_ENABLE = true
  +then
  +  LOCAL_RESOLVEDIR(TC4DIR,${TC4DIR},[tomcat distribution directory])
  +  
  +  if ${TEST} ! -f ${TC4DIR}/common/lib/servlet.jar
  +  then
  +AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TC4DIR}\])
  +  fi
  +
  +  if ${TEST} ! -f ${TC4DIR}/server/lib/catalina.jar
  +  then
  +AC_MSG_ERROR([Cannot find Catalina jar in \${TC4DIR}\])
  +  fi
  +
  +  if ${TEST} -z ${CLASSPATH}
  +  then
  +CLASSPATH=${TC4DIR}/common/lib/servlet.jar
  +  else
  +CLASSPATH=${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar
  +  fi
  +  CLASSPATH=${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar
  +
  +  TARGET=${TARGET} java
  +  CFGFILES=${CFGFILES} ./java/Makefile
  +else
  +  CLASSPATH=
  +  TC4DIR=
  +fi
  +AC_SUBST(CLASSPATH)
  +
   dnl -
   dnl Check wether we have to build the C API documentation or not
   dnl
  @@ -296,41 +336,6 @@
   )
   
   dnl --
  -dnl Check that we can build all classes depending on Tomcat if Java is enabled
  -dnl
  -dnl New vars: CLASSPATH
  -dnl Upd vars: TC4DIR TARGET
  -dnl --
  -if ${TEST} $JAVA_ENABLE = true
  -then
  -  LOCAL_RESOLVEDIR(TC4DIR,${TC4DIR},[tomcat distribution directory])
  -  
  -  if ${TEST} ! -f ${TC4DIR}/common/lib/servlet.jar
  -  then
  -AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TC4DIR}\])
  -  fi
  -
  -  if ${TEST} ! -f ${TC4DIR}/server/lib/catalina.jar
  -  then
  -AC_MSG_ERROR([Cannot find Catalina jar in \${TC4DIR}\])
  -  fi
  -
  -  if ${TEST} -z ${CLASSPATH}
  -  then
  -CLASSPATH=${TC4DIR}/common/lib/servlet.jar
  -  else
  -CLASSPATH=${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar
  -  fi
  -  CLASSPATH=${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar
  -
  -  TARGET=${TARGET} java
  -else
  -  CLASSPATH=
  -  TC4DIR=
  -fi
  -AC_SUBST(CLASSPATH)
  -
  -dnl --
   dnl Process the --with-apr=... command line argument
   dnl
   dnl   This is always processed, and sets the APR_SRCDIR variable. After this
  @@ -449,6 +454,9 @@
   
   dnl --
   dnl Was a module specified?
  +dnl
  +dnl New vars: N/A
  +dnl Upd vars: CFGFILES
   dnl --
   AC_MSG_CHECKING([target module])
   
  @@ -458,6 +466,7 @@
 AC_MSG_ERROR([No

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-15 Thread pier 

pier01/09/15 14:43:54

  Modified:webapp   configure.in
  Log:
  Added host-discovery and target directory discovery.
  
  Revision  ChangesPath
  1.33  +24 -12jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- configure.in  2001/09/15 04:46:17 1.32
  +++ configure.in  2001/09/15 21:43:54 1.33
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.32 2001/09/15 04:46:17 pier Exp $
  +dnl Version $Id: configure.in,v 1.33 2001/09/15 21:43:54 pier Exp $
   dnl --
   
   dnl --
  @@ -66,20 +66,24 @@
   dnl --
   sinclude(./support/aplocal.m4)
   sinclude(./support/apjava.m4)
  -AC_INIT(Makefile.in)
  +AC_INIT([Makefile.in])
  +AC_CONFIG_AUX_DIR([support])
   LOCAL_INIT()
  -LOCAL_HELP([External libraries and compilation flags])
  +AC_CANONICAL_HOST()
   
   dnl --
   dnl Setup initial variable value
   dnl
  -dnl New vars: MODULE TARGET_BUILD TARGET_CLEAN 
  -dnl   APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
  +dnl New vars: MODULE TARGET_BUILD TARGET_CLEAN HOST_CPU HOST_SYS
  +dnl   APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
   dnl Upd vars: N/A
   dnl --
   MODULE=
   TARGET_BUILD=lib-build
   TARGET_CLEAN=lib-clean
  +HOST_CPU=${host_cpu}
  +HOST_SYS=${host_os}
  +APR_CFGFLG=
   APR_SRCDIR=
   APR_LIBDIR=
   APR_INCDIR=
  @@ -88,6 +92,9 @@
   AC_SUBST(MODULE)
   AC_SUBST(TARGET_BUILD)
   AC_SUBST(TARGET_CLEAN)
  +AC_SUBST(HOST_CPU)
  +AC_SUBST(HOST_SYS)
  +AC_SUBST(APR_CFGFLG)
   AC_SUBST(APR_SRCDIR)
   AC_SUBST(APR_LIBDIR)
   AC_SUBST(APR_INCDIR)
  @@ -100,6 +107,7 @@
   dnl Upd vars: N/A
   dnl --
   LOCAL_RESOLVEDIR(SRCDIR,[${srcdir}],[sources directory])
  +LOCAL_RESOLVEDIR(TGTDIR,[.],[targets directory])
   AC_SUBST(SRCDIR)
   
   dnl -
  @@ -127,6 +135,7 @@
   dnl New vars: JAVA_HOME JAVAC JAR JAVADOC
   dnl Upd vars: N/A
   dnl -
  +LOCAL_HELP([External libraries and compilation flags])
   LOCAL_HEADER([JAVA-Language compilation tools])
   JAVA_INIT()
   JAVA_JAVAC()
  @@ -273,30 +282,33 @@
   if  ${TEST} -n ${local_apache}
   then
   
  -  dnl ---
  +  dnl -
 dnl APXS 2.0
 dnl   Note: APXS for 2.0 is broken, so we need to
 dnl   discover some of the values manually hoping
 dnl   to get the right layout.
 dnl
 dnl New vars: N/A
  -  dnl Upd vars: APR_VARFIL APR_LIBDIR APR_INCDIR
  -  dnl ---
  +  dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
  +  dnl -
 MODULE=apache-2.0
 local_prefix=`apxs -q PREFIX`
  +  APR_CFGFLG=
 APR_VARFIL=${local_prefix}/lib/APRVARS
 APR_LIBDIR=${local_prefix}/lib
 APR_INCDIR=${local_prefix}/include
 unset local_prefix
   else
   
  -  dnl --
  +  dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
  +  dnl -
 dnl APXS 1.3
 dnl
 dnl New vars: N/A
  -  dnl Upd vars: APR_VARFIL APR_LIBDIR APR_INCDIR
  -  dnl --
  +  dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
  +  dnl -
 MODULE=apache-1.3
  +  APR_CFGFLG=--enable-static --disable-shared --disable-threads
 APR_VARFIL=
 APR_LIBDIR=
 APR_INCDIR=
  @@ -357,7 +369,7 @@
 dnl 
 LOCAL_HEADER([Configuring APR])
 LOCAL_FILTEREXEC(local_return,
  -[./configure --enable-static --disable-shared --disable-threads],
  +[./configure ${APR_CFGFLG}],
   [APR configure],
   [${APR_SRCDIR}])

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-15 Thread pier 

pier01/09/15 17:30:10

  Modified:webapp   configure.in
  Log:
  Parse APRVARS during configure
  
  Revision  ChangesPath
  1.35  +22 -1 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- configure.in  2001/09/16 00:02:59 1.34
  +++ configure.in  2001/09/16 00:30:10 1.35
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.34 2001/09/16 00:02:59 pier Exp $
  +dnl Version $Id: configure.in,v 1.35 2001/09/16 00:30:10 pier Exp $
   dnl --
   
   dnl --
  @@ -406,6 +406,27 @@
 APR_LIBDIR=${APR_SRCDIR}/lib
 APR_VARFIL=${APR_SRCDIR}/APRVARS
   fi
  +
  +dnl --
  +dnl Parse APRVARS and discover what values we need
  +dnl
  +dnl New vars: APR_CFLAGS APR_CPPFLAGS APR_LDFLAGS APR_LIBS APR_INCLUDES
  +dnl Upd vars: N/A
  +dnl --
  +LOCAL_HEADER([Finishing up])
  +AC_MSG_CHECKING([for APR compilation flags])
  +if ${TEST} ! -f ${APR_VARFIL}
  +then
  +  AC_MSG_RESULT([error])
  +  AC_MSG_ERROR([Cannot find required APRVARS file])
  +fi
  +AC_MSG_RESULT([ok])
  +eval `${CAT} ${APR_VARFIL} | ${GREP} EXTRA_ | ${SED} s/EXTRA_/APR_/g`
  +AC_SUBST(APR_CFLAGS)
  +AC_SUBST(APR_CPPFLAGS)
  +AC_SUBST(APR_INCLUDES)
  +AC_SUBST(APR_LDFLAGS)
  +AC_SUBST(APR_LIBS)
   
   dnl --
   dnl Finish up

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-14 Thread pier 

pier01/09/14 16:52:19

  Modified:webapp   configure.in
  Log:
  Modified configure.in to use what has been modified/added in aplocal.m4
  
  Revision  ChangesPath
  1.30  +10 -9 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- configure.in  2001/09/14 02:36:02 1.29
  +++ configure.in  2001/09/14 23:52:19 1.30
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.29 2001/09/14 02:36:02 pier Exp $
  +dnl Version $Id: configure.in,v 1.30 2001/09/14 23:52:19 pier Exp $
   dnl --
   
   dnl --
  @@ -89,8 +89,7 @@
   dnl --
   dnl Check where sources are
   dnl --
  -LOCAL_RESOLVEDIR([${srcdir}],[sources directory])
  -SRCDIR=${DIR}
  +LOCAL_RESOLVEDIR(SRCDIR,[${srcdir}],[sources directory])
   
   dnl -
   dnl Check C environment
  @@ -100,10 +99,11 @@
   dnl   compiler is not available.
   dnl -
   LOCAL_HEADER([C-Language compilation tools])
  +LOCAL_CHECK_PROG(AR,ar)
  +LOCAL_CHECK_PROG(RANLIB,ranlib)
   AC_PROG_CC()
  +AC_PROG_CC_C_O()
   AC_PROG_CPP()
  -AC_PATH_PROG(AR,ar,${PATH})
  -AC_PATH_PROG(RANLIB,ranlib,${PATH})
   AC_SUBST(AR)
   AC_SUBST(RANLIB)
   
  @@ -219,8 +219,7 @@
   AC_MSG_ERROR([Cannot find APR buildconf program in \${APR_SRCDIR}\])
 fi
 
  -  LOCAL_RESOLVEDIR([${APR_SRCDIR}],[full APR directory path])
  -  APR_SRCDIR=${DIR}
  +  LOCAL_RESOLVEDIR(APR_SRCDIR,[${APR_SRCDIR}],[full APR directory path])
 
 dnl -
 dnl Build the configure script for APR and run it
  @@ -230,14 +229,16 @@
 cd ${APR_SRCDIR}
 
 LOCAL_HEADER([Building APR configure script])
  -  LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
  +  LOCAL_FILTEREXEC(ret,
  +[./buildconf],
  +[APR buildconf])
 if ${TEST} ${ret} -ne 0
 then
   AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
 fi
 
 LOCAL_HEADER([Configuring APR])
  -  LOCAL_FILTEREXEC(
  +  LOCAL_FILTEREXEC(ret,
   [./configure --enable-static --disable-shared --disable-threads],
   [APR configure])
 if ${TEST} ${ret} -ne 0

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-14 Thread pier 

pier01/09/14 17:38:01

  Modified:webapp   configure.in
  Log:
  Forgot trailing quotes in variable assignment.
  
  Revision  ChangesPath
  1.31  +2 -2  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- configure.in  2001/09/14 23:52:19 1.30
  +++ configure.in  2001/09/15 00:38:00 1.31
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl
  -dnl Version $Id: configure.in,v 1.30 2001/09/14 23:52:19 pier Exp $
  +dnl Version $Id: configure.in,v 1.31 2001/09/15 00:38:00 pier Exp $
   dnl --
   
   dnl --
  @@ -248,8 +248,8 @@
 cd ${curdir}
   
 APR_INCDIR=${APR_SRCDIR}/include
  -  APR_LIBDIR=${APR_SRCDIR}/lib
  -  APR_VARFIL=${APR_SRCDIR}/APRVARS
  +  APR_LIBDIR=${APR_SRCDIR}/lib
  +  APR_VARFIL=${APR_SRCDIR}/APRVARS
   fi

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-14 Thread pier 

pier01/09/14 21:46:17

  Modified:webapp   configure.in
  Log:
  Better reorganization of AutoConf configure.in
  Re-adding discovery of Tomcat distribution
  
  Revision  ChangesPath
  1.32  +182 -63   jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- configure.in  2001/09/15 00:38:00 1.31
  +++ configure.in  2001/09/15 04:46:17 1.32
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.31 2001/09/15 00:38:00 pier Exp $
  +dnl Version $Id: configure.in,v 1.32 2001/09/15 04:46:17 pier Exp $
   dnl --
   
   dnl --
  @@ -68,19 +68,26 @@
   sinclude(./support/apjava.m4)
   AC_INIT(Makefile.in)
   LOCAL_INIT()
  +LOCAL_HELP([External libraries and compilation flags])
   
   dnl --
   dnl Setup initial variable value
  +dnl
  +dnl New vars: MODULE TARGET_BUILD TARGET_CLEAN 
  +dnl   APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
  +dnl Upd vars: N/A
   dnl --
  -SRCDIR=
   MODULE=
  -AC_SUBST(SRCDIR)
  -AC_SUBST(MODULE)
  -
  +TARGET_BUILD=lib-build
  +TARGET_CLEAN=lib-clean
   APR_SRCDIR=
   APR_LIBDIR=
   APR_INCDIR=
   APR_VARFIL=
  +
  +AC_SUBST(MODULE)
  +AC_SUBST(TARGET_BUILD)
  +AC_SUBST(TARGET_CLEAN)
   AC_SUBST(APR_SRCDIR)
   AC_SUBST(APR_LIBDIR)
   AC_SUBST(APR_INCDIR)
  @@ -88,8 +95,12 @@
   
   dnl --
   dnl Check where sources are
  +dnl
  +dnl New vars: SRCDIR
  +dnl Upd vars: N/A
   dnl --
   LOCAL_RESOLVEDIR(SRCDIR,[${srcdir}],[sources directory])
  +AC_SUBST(SRCDIR)
   
   dnl -
   dnl Check C environment
  @@ -97,15 +108,88 @@
   dnl   We need to check local compilation in case the user got an APR
   dnl   distribution from a binary tarball (such as in Apache 2.0) and the
   dnl   compiler is not available.
  +dnl
  +dnl New vars: AR RANLIB CC CFLAGS CPP
  +dnl Upd vars: N/A
   dnl -
   LOCAL_HEADER([C-Language compilation tools])
   LOCAL_CHECK_PROG(AR,ar)
   LOCAL_CHECK_PROG(RANLIB,ranlib)
  +AC_SUBST(AR)
  +AC_SUBST(RANLIB)
   AC_PROG_CC()
   AC_PROG_CC_C_O()
   AC_PROG_CPP()
  -AC_SUBST(AR)
  -AC_SUBST(RANLIB)
  +
  +dnl -
  +dnl Check JAVA environment
  +dnl
  +dnl New vars: JAVA_HOME JAVAC JAR JAVADOC
  +dnl Upd vars: N/A
  +dnl -
  +LOCAL_HEADER([JAVA-Language compilation tools])
  +JAVA_INIT()
  +JAVA_JAVAC()
  +JAVA_JAR()
  +JAVA_JAVADOC()
  +
  +dnl --
  +dnl Process the --with-tomcat=... command line argument
  +dnl
  +dnl   This is always processed, and sets the CLASSPATH variable.
  +dnl
  +dnl New vars: TOMCAT_DIR
  +dnl Upd vars: N/A
  +dnl -
  +AC_ARG_WITH(tomcat,
  +  [  --with-tomcat[=DIR] path of a Tomcat 4.0 distribution. (DIR defaults
  +  to \/usr/local/tomcat\). Not required and ignored
  +  when the --enable-java option is not specified.],
  +  [
  +case ${withval} in
  +yes|YES|true|TRUE)
  +  TOMCAT_DIR=/usr/local/tomcat
  +  ;;
  +*)
  +  TOMCAT_DIR=${withval}
  +  ;;
  +esac
  +  ],[
  +TOMCAT_DIR=/usr/local/tomcat
  +  ]
  +)
  +
  +dnl --
  +dnl Check that we can build all classes depending on Tomcat if Java is enabled
  +dnl
  +dnl New vars: CLASSPATH
  +dnl Upd vars: TOMCAT_DIR TARGET_BUILD TARGET_CLEAN
  +dnl --
  +if ${TEST} $JAVA_ENABLE = TRUE
  +then
  +  LOCAL_RESOLVEDIR(TOMCAT_DIR,${TOMCAT_DIR},[tomcat distribution directory])
  +  
  +  if ${TEST} ! -f ${TOMCAT_DIR}/common/lib/servlet.jar
  +  then
  +AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TOMCAT_DIR}\])
  +  fi
  +
  +  if ${TEST} ! -f ${TOMCAT_DIR}/server/lib/catalina.jar
  +  then
  +AC_MSG_ERROR([Cannot find Catalina jar in

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-09 Thread pier 

pier01/09/09 20:35:10

  Modified:webapp   configure.in
  Log:
  Build modifications: Move around order of stuff in configure.in, flags first
  externals then, and targets finally. Added some more clues into the --help
  page too.
  
  Revision  ChangesPath
  1.28  +86 -64jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- configure.in  2001/09/05 15:40:27 1.27
  +++ configure.in  2001/09/10 03:35:09 1.28
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.27 2001/09/05 15:40:27 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.28 2001/09/10 03:35:09 pier Exp $
   dnl --
   
   dnl --
  @@ -84,11 +84,18 @@
   AC_SUBST(SRCDIR)
   
   dnl --
  +dnl Help message introducing --enable functions
  +dnl --
  +LOCAL_HELP([])
  +LOCAL_HELP([Available compilation options:])
  +
  +dnl --
   dnl Process the --enable-debug[=FILE] command line argument
   dnl --
   AC_MSG_CHECKING([debugging flags])
   AC_ARG_ENABLE(debug,
  -  [  --enable-debug  Build with full debugging output.],
  +  [  --enable-debug  build with debugging information (not advisable
  +  for generic/production operation).],
 [
   AC_MSG_RESULT([enabled])
   CFLAGS=${CFLAGS} -DDEBUG
  @@ -108,20 +115,27 @@
   dnl -
   dnl Check JAVA environment
   dnl -
  -AP_JAVA()
  +JAVA_CHECK()
   if ${TEST} ${JAVA_ENABLE} = true
   then
  -  AP_PROG_JAVAC()
  -  AP_PROG_JAR()
  +  JAVA_JAVAC()
  +  JAVA_PROG_JAR()
 TGTDIRS=${SRCDIR}/java ${TGTDIRS}
   fi
   
   dnl --
  +dnl Help message introducing --with functions for external libraries
  +dnl --
  +LOCAL_HELP([External libraries used:])
  +
  +dnl --
   dnl Process the --with-tomcat=... command line argument
   dnl --
   AC_MSG_CHECKING([Tomcat 4.0 directory])
   AC_ARG_WITH(tomcat,
  -  [  --with-tomcat=DIR  path of a Tomcat 4.0 distribution.],
  +  [  --with-tomcat[=DIR] path of a Tomcat 4.0 binary distribution (DIR
  +  defaults to \/usr/local/tomcat\). Required only in
  +  case the --enable-java option was specified too.],
 TOMCATDIR=${withval},
 TOMCATDIR=/usr/local/tomcat
   )
  @@ -152,6 +166,72 @@
   AC_SUBST(TOMCATDIR)
   
   dnl --
  +dnl Process the --with-apr=... command line argument
  +dnl --
  +AC_MSG_CHECKING([APR directory])
  +AC_ARG_WITH(apr,
  +  [  --with-apr[=DIR]path of an APR (Apache Portable Runtime) source
  +  distribution or CVS snapshot. (DIR defaults to
  +  \./apr\). Not required and ignored when the
  +  --with-apxs2 option is specified.],
  +  APRDIR=${withval},
  +  APRDIR=${SRCDIR}/apr
  +)
  +
  +if ${TEST} -z ${APA} -a -z ${APRDIR} ; then
  +  APRDIR=${SRCDIR}/apr
  +else
  +  APRDIR=${APXS_PREFIX}
  +fi
  +
  +if ${TEST} -z ${APA} ; then
  +  if ${TEST} ! -d ${APRDIR} ; then
  +AC_MSG_ERROR([Cannot find APR sources directory \${APRDIR}\])
  +  fi
  +
  +  if ${TEST} ! -x ${APRDIR}/buildconf ; then
  +AC_MSG_ERROR([Cannot find APR buildconf program in \${APRDIR}\])
  +  fi
  +
  +  curdir=`pwd`
  +  cd ${APRDIR}
  +  APRDIR=`pwd`
  +  AC_MSG_RESULT([${APRDIR}])
  +  cd ${curdir}
  +  AC_SUBST(APRDIR)
  +
  +  dnl Build the configure script for APR and run it
  +
  +  curdir=`pwd`
  +  cd ${APRDIR}
  +
  +  LOCAL_HEADER([Building APR configure script])
  +  LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
  +  if ${TEST} ${ret} -ne 0
  +  then
  +AC_MSG_ERROR([APR buildconf terminated with error code

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-05 Thread jfclere 

jfclere 01/09/05 08:40:27

  Modified:webapp   configure.in
  Log:
  Correct a typo $ missing.
  
  Revision  ChangesPath
  1.27  +2 -2  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- configure.in  2001/09/05 11:05:47 1.26
  +++ configure.in  2001/09/05 15:40:27 1.27
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.26 2001/09/05 11:05:47 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.27 2001/09/05 15:40:27 jfclere Exp $
   dnl --
   
   dnl --
  @@ -239,7 +239,7 @@
   )
   
   if ${TEST} -z ${APA} -a -z ${APRDIR} ; then
  -  APRDIR={SRCDIR}/apr
  +  APRDIR=${SRCDIR}/apr
   else
 APRDIR=${APXS_PREFIX}
   fi

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-05 Thread Pier Fumagalli 

[EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

 jfclere 01/09/05 08:40:27
 
 Modified:webapp   configure.in
 Log:
 Correct a typo $ missing.

They just posted a bug on that (or better, reopened a completely
different one)... Check out if that's what exactly this patch fixes... Bug
#2999

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2999


Pier

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-09-03 Thread jfclere 

jfclere 01/09/03 05:58:31

  Modified:webapp   configure.in
  Log:
  Change APXS_LD_SHLIB to prevent problem while doing make.
  
  Revision  ChangesPath
  1.25  +4 -1  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- configure.in  2001/08/31 10:26:24 1.24
  +++ configure.in  2001/09/03 12:58:31 1.25
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.24 2001/08/31 10:26:24 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.25 2001/09/03 12:58:31 jfclere Exp $
   dnl --
   
   dnl --
  @@ -209,6 +209,9 @@
   dnl test apache version
   APA=`${GREP} STANDARD20 ${APXS}`
   if  ${TEST} -z $APA ; then
  +  if ${TEST} -z APXS_LD_SHLIB; then
  + AC_MSG_ERROR([${APXS} do not seem a valid apxs)]) 
  +  fi
 TARGET=${SRCDIR}/apache-1.3
 makefile=apache-1.3/Makefile
   else

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jfclere 

jfclere 01/07/09 07:09:19

  Modified:webapp   configure.in
  Log:
  Arrange LOCAL_FILTEREXEC because ret is not set correctly.
  
  Revision  ChangesPath
  1.10  +3 -1  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in  2001/07/08 23:11:38 1.9
  +++ configure.in  2001/07/09 14:09:16 1.10
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.9 2001/07/08 23:11:38 pier Exp $
  +dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
   dnl --
   
   dnl --
  @@ -98,7 +98,9 @@
   done
   unset first
   unset line
  +exit $ret
 }
  +  ret=$?
   ])
   
   dnl --

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier P. Fumagalli 

Hmm If you do an exit $ret, it'll kill the whole ./configure process
with some bourne shells... Will check it...

Pier

[EMAIL PROTECTED] at [EMAIL PROTECTED] wrote:

 jfclere 01/07/09 07:09:19
 
 Modified:webapp   configure.in
 Log:
 Arrange LOCAL_FILTEREXEC because ret is not set correctly.
 
 Revision  ChangesPath
 1.10  +3 -1  jakarta-tomcat-connectors/webapp/configure.in
 
 Index: configure.in
 ===
 RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
 retrieving revision 1.9
 retrieving revision 1.10
 diff -u -r1.9 -r1.10
 --- configure.in2001/07/08 23:11:381.9
 +++ configure.in2001/07/09 14:09:161.10
 @@ -58,7 +58,7 @@
  dnl 
 --
  dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
  dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
 -dnl Version $Id: configure.in,v 1.9 2001/07/08 23:11:38 pier Exp $
 +dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
  dnl 
 --
  
  dnl 
 --
 @@ -98,7 +98,9 @@
  done
  unset first
  unset line
 +exit $ret
}
 +  ret=$?
  ])
  
  dnl 
 --

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jean-frederic clere 

Pier P. Fumagalli wrote:
 
 Hmm If you do an exit $ret, it'll kill the whole ./configure process
 with some bourne shells... Will check it...

Oop, I have just found one, on BS2000!

 
 Pier
 
 [EMAIL PROTECTED] at [EMAIL PROTECTED] wrote:
 
  jfclere 01/07/09 07:09:19
 
  Modified:webapp   configure.in
  Log:
  Arrange LOCAL_FILTEREXEC because ret is not set correctly.
 
  Revision  ChangesPath
  1.10  +3 -1  jakarta-tomcat-connectors/webapp/configure.in
 
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in2001/07/08 23:11:381.9
  +++ configure.in2001/07/09 14:09:161.10
  @@ -58,7 +58,7 @@
   dnl
  --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.9 2001/07/08 23:11:38 pier Exp $
  +dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
   dnl
  --
 
   dnl
  --
  @@ -98,7 +98,9 @@
   done
   unset first
   unset line
  +exit $ret
 }
  +  ret=$?
   ])
 
   dnl
  --

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jean-frederic clere 

I have some more problems because printf does not like \133. (Why \133 and not
]?).

I have some remarks:

- Why using \033\13301m, \033\13300m etc but not bold=\033\13301m,
offbold=\033\13300m, red=...?

- \133 is not ] but $ on my EBCDIC platform.

- Why not using bold=`tput smso` offbold=`tput rmso`? Does someone know how to
ask for red and offred?

Jean-frederic


Pier P. Fumagalli wrote:
 
 Hmm If you do an exit $ret, it'll kill the whole ./configure process
 with some bourne shells... Will check it...
 
 Pier
 
 [EMAIL PROTECTED] at [EMAIL PROTECTED] wrote:
 
  jfclere 01/07/09 07:09:19
 
  Modified:webapp   configure.in
  Log:
  Arrange LOCAL_FILTEREXEC because ret is not set correctly.
 
  Revision  ChangesPath
  1.10  +3 -1  jakarta-tomcat-connectors/webapp/configure.in
 
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in2001/07/08 23:11:381.9
  +++ configure.in2001/07/09 14:09:161.10
  @@ -58,7 +58,7 @@
   dnl
  --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.9 2001/07/08 23:11:38 pier Exp $
  +dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
   dnl
  --
 
   dnl
  --
  @@ -98,7 +98,9 @@
   done
   unset first
   unset line
  +exit $ret
 }
  +  ret=$?
   ])
 
   dnl
  --

RE: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread GOMEZ Henri 

May be you could use what Ralf used for mod_ssl :)

...

#   some optional terminal sequences
case $TERM in
xterm|xterm*|vt220|vt220*)
T_MD=`echo dummy | awk '{ printf(%c%c%c%c, 27, 91, 49, 109); }'`
T_ME=`echo dummy | awk '{ printf(%c%c%c, 27, 91, 109); }'`
;;
vt100|vt100*)
T_MD=`echo dummy | awk '{ printf(%c%c%c%c%c%c, 27, 91, 49, 109, 0,
0); }'`
T_ME=`echo dummy | awk '{ printf(%c%c%c%c%c, 27, 91, 109, 0, 0);
}'`
;;
default)
T_MD=''
T_ME=''
;;
esac



   echo ${T_MD}INITIALIZATION${T_ME}

...

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting jean-frederic clere [EMAIL PROTECTED]:

 Pier P. Fumagalli wrote:
  
  Hmm If you do an exit $ret, it'll kill the whole ./configure
  process with some bourne shells... Will check it...
 
 Oop, I have just found one, on BS2000!

And OS/X... It seems to me that the only case in which that would work is 
when the script is executed by BASH, that forks the second part of the pipe 
into another process, but if it's interactive, we're screwed :)

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting jean-frederic clere [EMAIL PROTECTED]:

 I have some more problems because printf does not like \133. (Why
 \133 and not ]?).

Bacause [ and ] are the string delimiters in M4... If you change that and try 
to run AutoConf, it'll complain...


 I have some remarks:
 
 - Why using \033\13301m, \033\13300m etc but not
 bold=\033\13301m,
 offbold=\033\13300m, red=...?
 
 - \133 is not ] but $ on my EBCDIC platform.
 
 - Why not using bold=`tput smso` offbold=`tput rmso`? Does someone
 know how to ask for red and offred?

Why don't we simply remove all the colourization? It's kinda fancy and 
neat, but we don't seriously _need_ that...
I got that code from Ralf's some project, and looked cool on my terminal, 
but we seriously don't depend on having colours in the script :)

   Pier

BTW, for US citizens, s/colour/color/g (getting the accent and more over 
here)

RE: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting GOMEZ Henri [EMAIL PROTECTED]:

 May be you could use what Ralf used for mod_ssl :)

Version 2.0 of the code I stole :) Why don't we remove colours and that's 
it? :)

Pier

RE: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread GOMEZ Henri 

Hi,

Was talking about mod_ssl for 1.3.x 

and only bold used there...

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Pier Fumagalli [mailto:[EMAIL PROTECTED]]
Sent: Monday, July 09, 2001 5:31 PM
To: [EMAIL PROTECTED]
Subject: RE: cvs commit: jakarta-tomcat-connectors/webapp configure.in


Quoting GOMEZ Henri [EMAIL PROTECTED]:

 May be you could use what Ralf used for mod_ssl :)

Version 2.0 of the code I stole :) Why don't we remove colours 
and that's 
it? :)

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jean-frederic clere 

Pier Fumagalli wrote:
 
 Quoting jean-frederic clere [EMAIL PROTECTED]:
 
  Pier P. Fumagalli wrote:
  
   Hmm If you do an exit $ret, it'll kill the whole ./configure
   process with some bourne shells... Will check it...
 
  Oop, I have just found one, on BS2000!
 
 And OS/X... It seems to me that the only case in which that would work is
 when the script is executed by BASH, that forks the second part of the pipe
 into another process, but if it's interactive, we're screwed :)

What about this:
+++
Index: configure.in 
=== 
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v 
retrieving revision 1.10
diff -u -r1.10 configure.in 
--- configure.in2001/07/09 14:09:16 1.10
+++ configure.in2001/07/09 15:38:33 
@@ -98,9 +98,9 @@   
 done   
 unset first
 unset line 
-exit $ret  
+echo $ret  retfile
   }
-  ret=$?   
+  ret=`cat retfile`
 ]) 

 dnl -- 
+++


 Pier

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread pier 

pier01/07/09 08:46:00

  Modified:webapp   configure.in
  Log:
  Removed color grief once for all (nifty but useless and unportable).
  Fixed the exit $ret bug introduced by JFC.
  
  Revision  ChangesPath
  1.11  +8 -8  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- configure.in  2001/07/09 14:09:16 1.10
  +++ configure.in  2001/07/09 15:45:57 1.11
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.11 2001/07/09 15:45:57 pier Exp $
   dnl --
   
   dnl --
  @@ -67,15 +67,16 @@
   AC_DEFUN(LOCAL_INIT,[
 AC_PATH_PROG(test,test,${PATH})
 AC_PATH_PROG(true,true,${PATH})
  -  AC_PATH_PROG(printf,printf,${PATH})
  +  AC_PATH_PROG(echo,echo,${PATH})
   ])
   
   AC_DEFUN(LOCAL_HEADER,[
  -  ${printf} \n\033\13301;31m%s\033\13300m\n $1 12
  +  ${echo} 
  +  ${echo} $1 12
   ])
   
   AC_DEFUN(LOCAL_FILTEREXEC,[
  -  ${printf} \033\13301mInvoking\033\13300m: %s\n $1
  +  ${echo}   Invoking: $1
 {
   $1
   echo retvalue $?
  @@ -92,13 +93,12 @@
   then
 ret=${line}
   else
  -  ${printf} \033\13301m%s\033\13300m: %s\n $2 ${first} ${line}
  +  ${echo} $2: ${first} ${line}
   fi
 fi
   done
   unset first
   unset line
  -exit $ret
 }
 ret=$?
   ])
  @@ -217,7 +217,7 @@
   cd ${APRDIR}
   
   LOCAL_HEADER([Building APR configure script])
  -LOCAL_FILTEREXEC([./buildconf],[  APR buildconf])
  +LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
   if ${test} ${ret} -ne 0
   then
 AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
  @@ -225,7 +225,7 @@
   
   LOCAL_HEADER([Configuring APR])
   LOCAL_FILTEREXEC([./configure --enable-static --disable-shared --disable-threads],
  - [  APR configure])
  + [APR configure])
   if ${test} ${ret} -ne 0
   then
 AC_MSG_ERROR([APR configure script terminated with error code ${ret}])

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting jean-frederic clere [EMAIL PROTECTED]:
 
 What about this:

 -exit $ret  
 +echo $ret  retfile
}
 -  ret=$?   
 +  ret=`cat retfile`
  ]) 

AAARRRGGGHHH! :) I found out why you're trying to do that :) (Me dork!)

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jean-frederic clere 

Pier Fumagalli wrote:
 
 Quoting jean-frederic clere [EMAIL PROTECTED]:
 
  I have some more problems because printf does not like \133. (Why
  \133 and not ]?).
 
 Bacause [ and ] are the string delimiters in M4... If you change that and try
 to run AutoConf, it'll complain...

Yep, it does.

 
  I have some remarks:
 
  - Why using \033\13301m, \033\13300m etc but not
  bold=\033\13301m,
  offbold=\033\13300m, red=...?
 
  - \133 is not ] but $ on my EBCDIC platform.
 
  - Why not using bold=`tput smso` offbold=`tput rmso`? Does someone
  know how to ask for red and offred?
 
 Why don't we simply remove all the colourization? It's kinda fancy and
 neat, but we don't seriously _need_ that...
 I got that code from Ralf's some project, and looked cool on my terminal,
 but we seriously don't depend on having colours in the script :)

Agreed, all cursors and colours are useless when doing nohup
nice_shell_that_build_world.
  
 
Pier
 
 BTW, for US citizens, s/colour/color/g (getting the accent and more over
 here)

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread pier 

pier01/07/09 08:57:59

  Modified:webapp   configure.in
  Log:
  Fixed bug I introduced 5 seconds ago. Now the return value of LOCAL_FILTEREXEC
  should be correctly returned to the parent. (try to modify the last line of
  APR buildconf to exit with a non-zero value and execute configure, it should
  report an error)
  
  Revision  ChangesPath
  1.12  +2 -2  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- configure.in  2001/07/09 15:45:57 1.11
  +++ configure.in  2001/07/09 15:57:56 1.12
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.11 2001/07/09 15:45:57 pier Exp $
  +dnl Version $Id: configure.in,v 1.12 2001/07/09 15:57:56 pier Exp $
   dnl --
   
   dnl --
  @@ -100,7 +100,7 @@
   unset first
   unset line
 }
  -  ret=$?
  +  ${echo}   Execution of $1 returned $ret
   ])
   
   dnl --

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting jean-frederic clere [EMAIL PROTECTED]:
 
 Agreed, all cursors and colours are useless when doing nohup
 nice_shell_that_build_world.

Fixed in CVS :)

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier Fumagalli 

Quoting [EMAIL PROTECTED]:
 
 Fixed bug I introduced 5 seconds ago. Now the return value of
 LOCAL_FILTEREXEC should be correctly returned to the parent.
 (try to modify the last line of APR buildconf to exit with a non-zero
 value and execute configure, it should report an error)

Jean Frederic, can you check if it works for you now? Thanks

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread jean-frederic clere 

Pier Fumagalli wrote:
 
 Quoting [EMAIL PROTECTED]:
 
  Fixed bug I introduced 5 seconds ago. Now the return value of
  LOCAL_FILTEREXEC should be correctly returned to the parent.
  (try to modify the last line of APR buildconf to exit with a non-zero
  value and execute configure, it should report an error)
 
 Jean Frederic, can you check if it works for you now? Thanks

No, it does not, because the shell forks and ret is not set in father but in the
son process (after the |).
Look to the output:
+++
APR configure: creating include/arch/unix/apr_private.h
  Execution of ./configure --enable-static --disable-shared --disable-threads
returned
/usr/bin/test: integer expression expected before -ne

+++

The only work-around I see is to write the ret in a file and read it.

+++
Index: configure.in 
=== 
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v 
retrieving revision 1.12
diff -u -r1.12 configure.in 
--- configure.in2001/07/09 15:57:56 1.12
+++ configure.in2001/07/09 16:59:22 
@@ -99,7 +99,9 @@   
 done   
 unset first
 unset line 
+echo ${ret}  retfile  
   }
+  ret=`cat retfile`
   ${echo}   Execution of $1 returned $ret
 ]) 
+++

 
 Pier

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread pier 

pier01/07/09 10:59:51

  Modified:webapp   configure.in
  Log:
  Committed JFC's patch for returning the right return value out of LOCAL_FILTEREXEC
  
  Revision  ChangesPath
  1.13  +5 -1  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- configure.in  2001/07/09 15:57:56 1.12
  +++ configure.in  2001/07/09 17:59:48 1.13
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.12 2001/07/09 15:57:56 pier Exp $
  +dnl Version $Id: configure.in,v 1.13 2001/07/09 17:59:48 pier Exp $
   dnl --
   
   dnl --
  @@ -68,6 +68,7 @@
 AC_PATH_PROG(test,test,${PATH})
 AC_PATH_PROG(true,true,${PATH})
 AC_PATH_PROG(echo,echo,${PATH})
  +  AC_PATH_PROG(rm,rm,${PATH})
   ])
   
   AC_DEFUN(LOCAL_HEADER,[
  @@ -99,7 +100,10 @@
   done
   unset first
   unset line
  +echo ${ret}  retvalue.tmp
 }
  +  ret=`cat retvalue.tmp`
  +  ${rm} retvalue.tmp
 ${echo}   Execution of $1 returned $ret
   ])

Re: cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread Pier P. Fumagalli 

jean-frederic clere at [EMAIL PROTECTED] wrote:

 Pier Fumagalli wrote:
 
 Quoting [EMAIL PROTECTED]:
 
 Fixed bug I introduced 5 seconds ago. Now the return value of
 LOCAL_FILTEREXEC should be correctly returned to the parent.
 (try to modify the last line of APR buildconf to exit with a non-zero
 value and execute configure, it should report an error)
 
 Jean Frederic, can you check if it works for you now? Thanks
 
 No, it does not, because the shell forks and ret is not set in father but in
 the son process (after the |).

Ok... Patched... Check it out :)

Pier

cvs commit: jakarta-tomcat-connectors/webapp configure.in

2001-07-09 Thread pier 

pier01/07/09 15:20:13

  Modified:webapp   configure.in
  Log:
  Fix from JFC @ home.
  
  Revision  ChangesPath
  1.14  +2 -1  jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- configure.in  2001/07/09 17:59:48 1.13
  +++ configure.in  2001/07/09 22:20:12 1.14
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
   dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
  -dnl Version $Id: configure.in,v 1.13 2001/07/09 17:59:48 pier Exp $
  +dnl Version $Id: configure.in,v 1.14 2001/07/09 22:20:12 pier Exp $
   dnl --
   
   dnl --
  @@ -78,6 +78,7 @@
   
   AC_DEFUN(LOCAL_FILTEREXEC,[
 ${echo}   Invoking: $1
  +  ${echo} -1  retvalue.tmp
 {
   $1
   echo retvalue $?