cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4 config.guess config.sub

2002-05-01 Thread pier 

pier02/05/01 08:53:31

  Removed: webapp/support aplocal.m4 config.guess config.sub
  Log:
  Removed scripts not required anymore by configure.

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2002-04-30 Thread pier 

pier02/04/30 09:42:44

  Modified:webapp/support aplocal.m4
  Log:
  Stripped little thing  that prevented to build ./configure with AutoConf
  2.52 and greater.
  
  Revision  ChangesPath
  1.10  +6 -6  jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- aplocal.m41 Nov 2001 22:20:52 -   1.9
  +++ aplocal.m430 Apr 2002 16:42:44 -  1.10
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.9 2001/11/01 22:20:52 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.10 2002/04/30 16:42:44 pier Exp $
   dnl --
   
   dnl --
  @@ -127,11 +127,11 @@
   ])
   
   AC_DEFUN(LOCAL_HELP,[
  -  AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
  -  ac_help="${ac_help}
  -
  -[$1]"
  -  AC_DIVERT_POP()
  +dnl   AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
  +dnl   ac_help="${ac_help}
  +dnl 
  +dnl [$1]"
  +dnl   AC_DIVERT_POP()
   ])
   
   dnl --
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2001-09-16 Thread pier 

pier01/09/16 16:55:05

  Modified:webapp/support aplocal.m4
  Log:
  Added "ln" to the list of required binaries.
  
  Revision  ChangesPath
  1.8   +3 -1  jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aplocal.m42001/09/15 04:44:43 1.7
  +++ aplocal.m42001/09/16 23:55:05 1.8
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.7 2001/09/15 04:44:43 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.8 2001/09/16 23:55:05 pier Exp $
   dnl --
   
   dnl --
  @@ -72,6 +72,7 @@
 LOCAL_CHECK_PROG(GREP,grep)
 LOCAL_CHECK_PROG(CAT,cat)
 LOCAL_CHECK_PROG(SED,sed)
  +  LOCAL_CHECK_PROG(LN,ln)
 LOCAL_CHECK_PROG(RM,rm)
 AC_SUBST(TEST)
 AC_SUBST(TRUE)
  @@ -79,6 +80,7 @@
 AC_SUBST(GREP)
 AC_SUBST(CAT)
 AC_SUBST(SED)
  +  AC_SUBST(LN)
 AC_SUBST(RM)
   ])

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2001-09-14 Thread pier 

pier01/09/14 21:44:43

  Modified:webapp/support aplocal.m4
  Log:
  Added directory switching to LOCAL_FILTEREXEC
  
  Revision  ChangesPath
  1.7   +26 -4 jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- aplocal.m42001/09/14 23:51:34 1.6
  +++ aplocal.m42001/09/15 04:44:43 1.7
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.6 2001/09/14 23:51:34 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.7 2001/09/15 04:44:43 pier Exp $
   dnl --
   
   dnl --
  @@ -66,7 +66,7 @@
   dnl   process makefiles. Those are TRUE, ECHO, GREP, CAT, SED and RM
   dnl --
   AC_DEFUN(LOCAL_INIT,[
  -  AC_CHECK_PROG(TEST,"test","test","",${PATH})
  +  AC_PATH_PROG(TEST,"test","test",${PATH})
 LOCAL_CHECK_PROG(TRUE,true)
 LOCAL_CHECK_PROG(ECHO,echo)
 LOCAL_CHECK_PROG(GREP,grep)
  @@ -90,10 +90,18 @@
   dnl   Parameters:
   dnl $1 - name of the variable where the program name must be stored
   dnl $2 - binary name of the program to look for
  +dnl $3 - Extra PATH to be added to the search
   dnl --
   AC_DEFUN(LOCAL_CHECK_PROG,[
  +  if ${TEST} -z "$3"
  +  then
  +local_path="${PATH}"
  +  else
  +local_path="$3:${PATH}"
  +  fi
 local_vnam="$1"
  -  AC_CHECK_PROG($1,$2,$2,,${PATH})
  +  unset $1
  +  AC_PATH_PROG($1,$2,"",${local_path})
 local_vval=`eval "echo \\$$local_vnam"`
 if ${TEST} -z "${local_vval}"
 then
  @@ -101,6 +109,7 @@
 fi
 unset local_vnam
 unset local_vval
  +  unset local_path
   ])
   
   dnl --
  @@ -118,6 +127,7 @@
   AC_DEFUN(LOCAL_HELP,[
 AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
 ac_help="${ac_help}
  +
   [$1]"
 AC_DIVERT_POP()
   ])
  @@ -130,17 +140,24 @@
   dnl $1 - name of the variable containing the return value (error code).
   dnl $2 - name of the binary/script to invoke
   dnl $3 - message used for pretty printing output
  +dnl $4 - the directory where the command must be executed
   dnl --
   AC_DEFUN(LOCAL_FILTEREXEC,[
  +  local_curdir="`pwd`"
  +  if ${TEST} -n "$4"
  +  then
  +cd "$4"
  +  fi
  +
 local_vnam="$1"
  -  ${ECHO} "  Invoking: $2"
  +  ${ECHO} "  Invoking: \"$2\" in \"$4\""
 ${ECHO} "-1" > retvalue.tmp
   
 set local_file $2
 local_file=[$]2
 if ${TEST} ! -x "${local_file}"
 then
  -AC_MSG_ERROR([cannot find or execute \"${local_file}\" in \"`pwd`\"])
  +AC_MSG_ERROR([cannot find or execute \"${local_file}\" in \"$4\"])
 fi
   
 {
  @@ -173,8 +190,13 @@
 local_vval=`eval "echo \\$$local_vnam"`
 ${RM} retvalue.tmp
 ${ECHO} "  Execution of $2 returned ${local_vval}"
  +
  +  cd "${local_curdir}"
  +  unset local_curdir
 unset local_vnam
 unset local_vval
  +
  +
   ])
   
   dnl --

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2001-09-14 Thread pier 

pier01/09/14 16:51:34

  Modified:webapp/support aplocal.m4
  Log:
  Added LOCAL_CHECK_PROG to check and fail if a program was not found.
  Added documentation on functions (this file is getting big and cumbersome)
  Modified LOCAL_FILTEREXEC to store the error-code returned by execution in
  a variable (specified by name)
  Modified LOCAL_RESOLVEDIR to check for the directory before resolving (doh)
  and to store the full path name in to a variable (specified by name)
  
  Revision  ChangesPath
  1.6   +95 -21jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- aplocal.m42001/09/14 01:26:19 1.5
  +++ aplocal.m42001/09/14 23:51:34 1.6
  @@ -57,17 +57,22 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.5 2001/09/14 01:26:19 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.6 2001/09/14 23:51:34 pier Exp $
   dnl --
   
  +dnl --
  +dnl LOCAL_INIT
  +dnl   Discover binaries required further on in the automake process and to
  +dnl   process makefiles. Those are TRUE, ECHO, GREP, CAT, SED and RM
  +dnl --
   AC_DEFUN(LOCAL_INIT,[
  -  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_CHECK_PROG(TEST,"test","test","",${PATH})
  +  LOCAL_CHECK_PROG(TRUE,true)
  +  LOCAL_CHECK_PROG(ECHO,echo)
  +  LOCAL_CHECK_PROG(GREP,grep)
  +  LOCAL_CHECK_PROG(CAT,cat)
  +  LOCAL_CHECK_PROG(SED,sed)
  +  LOCAL_CHECK_PROG(RM,rm)
 AC_SUBST(TEST)
 AC_SUBST(TRUE)
 AC_SUBST(ECHO)
  @@ -77,6 +82,34 @@
 AC_SUBST(RM)
   ])
   
  +dnl --
  +dnl LOCAL_CHECK_PROG
  +dnl   Check wether a program exists in the current PATH or not and fail if
  +dnl   this was not found.
  +dnl
  +dnl   Parameters:
  +dnl $1 - name of the variable where the program name must be stored
  +dnl $2 - binary name of the program to look for
  +dnl --
  +AC_DEFUN(LOCAL_CHECK_PROG,[
  +  local_vnam="$1"
  +  AC_CHECK_PROG($1,$2,$2,,${PATH})
  +  local_vval=`eval "echo \\$$local_vnam"`
  +  if ${TEST} -z "${local_vval}"
  +  then
  +AC_MSG_ERROR([cannot find required binary \"$2\"])
  +  fi
  +  unset local_vnam
  +  unset local_vval
  +])
  +
  +dnl --
  +dnl LOCAL_HEADER
  +dnl   Output a header for a stage of the configure process
  +dnl
  +dnl   Parameters:
  +dnl $1 - message to be printed in the header
  +dnl --
   AC_DEFUN(LOCAL_HEADER,[
 ${ECHO} ""
 ${ECHO} "$1" 1>&2
  @@ -89,11 +122,29 @@
 AC_DIVERT_POP()
   ])
   
  +dnl --
  +dnl LOCAL_FILTEREXEC
  +dnl   Execute a program filtering its output (pretty printing).
  +dnl
  +dnl   Parameters:
  +dnl $1 - name of the variable containing the return value (error code).
  +dnl $2 - name of the binary/script to invoke
  +dnl $3 - message used for pretty printing output
  +dnl --
   AC_DEFUN(LOCAL_FILTEREXEC,[
  -  ${ECHO} "  Invoking: $1"
  +  local_vnam="$1"
  +  ${ECHO} "  Invoking: $2"
 ${ECHO} "-1" > retvalue.tmp
  +
  +  set local_file $2
  +  local_file=[$]2
  +  if ${TEST} ! -x "${local_file}"
  +  then
  +AC_MSG_ERROR([cannot find or execute \"${local_file}\" in \"`pwd`\"])
  +  fi
  +
 {
  -$1
  +$2
   ${ECHO} retvalue $?
 }|{
   ret=0
  @@ -108,25 +159,48 @@
   then
 ret="${line}"
   else
  -  ${ECHO} "$2: ${first} ${line}"
  +  ${ECHO} "$3: ${first} ${line}"
   fi
 fi
   done
  +echo "${ret}" > retvalue.tmp
   unset first
   unset line
  -echo "${ret}" > retvalue.tmp
  +unset ret
 }
  -  ret=`${CAT} retvalue.tmp`
  +
  +  eval "$local_vnam=`${CAT} retvalue.tmp`"
  +  local_vval=`eval "echo \\$$local_vnam"`
 ${RM} retvalue.tmp
  -  ${ECHO} "  Execution of $1 returned ${ret}"
  +  ${ECHO} "  Execution of $2 returned ${local_vval}"
  +  unset local_vnam
  +  unset local_vval

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2001-09-13 Thread pier 

pier01/09/13 18:26:19

  Modified:webapp/support aplocal.m4
  Log:
  Added directory resolution script.
  
  Revision  ChangesPath
  1.5   +10 -1 jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- aplocal.m42001/09/10 03:33:51 1.4
  +++ aplocal.m42001/09/14 01:26:19 1.5
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.4 2001/09/10 03:33:51 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.5 2001/09/14 01:26:19 pier Exp $
   dnl --
   
   AC_DEFUN(LOCAL_INIT,[
  @@ -121,3 +121,12 @@
 ${ECHO} "  Execution of $1 returned ${ret}"
   ])
   
  +AC_DEFUN(LOCAL_RESOLVEDIR,[
  +  AC_MSG_CHECKING([for $2])
  +  localdir="`pwd`"
  +  cd "$1"
  +  DIR=`pwd`
  +  AC_MSG_RESULT([${DIR}])
  +])
  +  
  +

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4

2001-09-09 Thread pier 

pier01/09/09 20:33:51

  Modified:webapp/support aplocal.m4
  Log:
  Build modifications: Added function to format the help page issued by
  configure --help.
  
  Revision  ChangesPath
  1.4   +8 -1  jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- aplocal.m42001/08/06 20:18:26 1.3
  +++ aplocal.m42001/09/10 03:33:51 1.4
  @@ -57,7 +57,7 @@
   
   dnl --
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.3 2001/08/06 20:18:26 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.4 2001/09/10 03:33:51 pier Exp $
   dnl --
   
   AC_DEFUN(LOCAL_INIT,[
  @@ -80,6 +80,13 @@
   AC_DEFUN(LOCAL_HEADER,[
 ${ECHO} ""
 ${ECHO} "$1" 1>&2
  +])
  +
  +AC_DEFUN(LOCAL_HELP,[
  +  AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
  +  ac_help="${ac_help}
  +[$1]"
  +  AC_DIVERT_POP()
   ])
   
   AC_DEFUN(LOCAL_FILTEREXEC,[

cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4 apjava.m4 buildconf.sh

2001-08-06 Thread pier 

pier01/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  ChangesPath
  1.5   +23 -17jakarta-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 @@
   dnlAlternately, this acknowlegement may appear in the software itself, if
   dnland wherever such third-party acknowlegements normally appear.
   dnl
  -dnl 4. The names  "The  Jakarta  Project",  "WebApp",  and  "Apache  Software
  -dnlFoundation"  must not be used  to endorse or promote  products derived
  -dnlfrom this  software without  prior  written  permission.  For  written
  -dnlpermission, please contact <[EMAIL PROTECTED]>.
  +dnl 4. The names "The Jakarta Project",  "Apache WebApp Module",  and "Apache
  +dnlSoftware Foundation"  must not be used to endorse or promote  products
  +dnlderived  from this  software  without  prior  written  permission. For
  +dnlwritten 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 
  -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.#
  +#