You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/10/17 20:33:31 UTC

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

pier        01/10/17 11:33:31

  Modified:    webapp   configure.in
               webapp/support buildconf.sh
  Log:
  Preparing scripts for daily distribution of source tarballs.
  
  Revision  Changes    Path
  1.43      +11 -11    jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- configure.in	2001/10/10 15:30:24	1.42
  +++ configure.in	2001/10/17 18:33:31	1.43
  @@ -58,7 +58,7 @@
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <ma...@eng.sun.com>
   dnl Author Jon S. Stevens <ma...@latchkey.com>
  -dnl Version $Id: configure.in,v 1.42 2001/10/10 15:30:24 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.43 2001/10/17 18:33:31 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -493,16 +493,16 @@
     dnl ------------------------------
     dnl Build the APR configure script
     dnl ------------------------------
  -  LOCAL_HEADER([Building APR configure script])
  -  LOCAL_FILTEREXEC(local_return,
  -    [./buildconf],
  -    [APR buildconf],
  -    [${APR_SRCDIR}])
  -
  -  if ${TEST} "${local_return}" -ne "0"
  -  then
  -    AC_MSG_ERROR([APR buildconf terminated with error code ${local_return}])
  -  fi
  +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
  +dnl    AC_MSG_ERROR([APR buildconf terminated with error code ${local_return}])
  +dnl  fi
     
     dnl ----------------------------
     dnl Run the APR configure script
  
  
  
  1.5       +17 -4     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildconf.sh	2001/08/06 18:04:14	1.4
  +++ buildconf.sh	2001/10/17 18:33:31	1.5
  @@ -59,7 +59,7 @@
   # ------------------------------------------------------------------------- #
   # Author Pier Fumagalli <pi...@sun.com>
   # Author Jon S. Stevens <ma...@latchkey.com>
  -# Version $Id: buildconf.sh,v 1.4 2001/08/06 18:04:14 pier Exp $
  +# Version $Id: buildconf.sh,v 1.5 2001/10/17 18:33:31 pier Exp $
   # ------------------------------------------------------------------------- #
   
   if [ ! -f ./configure.in ]
  @@ -67,9 +67,22 @@
       echo "Cannot find \"configure.in\" file."
       exit 1
   fi
  -if [ ! -d ./apr ]
  +if [ -f "./apr/buildconf" ]
   then
  -    mkdir apr
  -    echo "Don't a forget to put a copy of the APR sources in `pwd`/apr/"
  +    echo "--- Running the \"buildconf\" script for APR"
  +    cd ./apr
  +    sh ./buildconf
  +    cd ..
  +else
  +    echo "--- Cannot run APR \"buildconf\" script"
  +    echo "Don't a forget to download a copy of the APR sources, and to run"
  +    echo "the buildconf script for it:"
  +    echo "  # cd [path to APR sources]"
  +    echo "  # ./buildconf"
  +    echo "  # cd [path to WebApp sources]"
  +    echo "Then remember to run ./configure script including the command line"
  +    echo "option \"--with-apr=[path to APR sources]\""
   fi
  +echo "--- Creating WebApp \"configure\" script"
   autoconf
  +echo "--- All done"