httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0/build build.mk build2.mk buildcheck.sh cvsclean snapshot
Date Sat, 24 Mar 2001 09:43:06 GMT
fielding    01/03/24 01:43:06

  Modified:    .        CHANGES acinclude.m4 buildconf configure.in
  Removed:     build    build.mk build2.mk buildcheck.sh cvsclean snapshot
  Log:
  Untangled the buildconf script and eliminated the need for build's
  aclocal.m4, generated_lists, build.mk, build2.mk, and a host of other
  libtool muck that is now under srclib/apr/build.  More to follow.
  
  Revision  Changes    Path
  1.144     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- CHANGES	2001/03/22 23:05:50	1.143
  +++ CHANGES	2001/03/24 09:43:05	1.144
  @@ -1,4 +1,9 @@
   Changes with Apache 2.0.15-dev
  +
  +  *) Untangled the buildconf script and eliminated the need for build's
  +     aclocal.m4, generated_lists, build.mk, build2.mk, and a host of other
  +     libtool muck that is now under srclib/apr/build.  [Roy Fielding]
  +
     *) Win32: Don't accept more connections than we have worker threads
        to handle.
        [Bill Stoddard]
  
  
  
  1.70      +0 -6      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- acinclude.m4	2001/03/02 15:46:10	1.69
  +++ acinclude.m4	2001/03/24 09:43:05	1.70
  @@ -181,12 +181,6 @@
     fi
   ])
   
  -sinclude(srclib/apr/build/apr_common.m4)
  -sinclude(srclib/apr/build/apr_network.m4)
  -sinclude(srclib/apr/build/apr_threads.m4)
  -sinclude(srclib/apr/build/apr_hints.m4)
  -sinclude(hints.m4)
  -
   dnl APACHE_MODPATH_INIT(modpath)
   AC_DEFUN(APACHE_MODPATH_INIT,[
     current_dir=$1
  
  
  
  1.20      +112 -3    httpd-2.0/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/buildconf,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- buildconf	2000/09/24 12:40:05	1.19
  +++ buildconf	2001/03/24 09:43:05	1.20
  @@ -1,13 +1,122 @@
   #!/bin/sh
  +# ====================================================================
  +# The Apache Software License, Version 1.1
  +#
  +# Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  +# reserved.
  +#
  +# Redistribution and use in source and binary forms, with or without
  +# modification, are permitted provided that the following conditions
  +# are met:
  +#
  +# 1. Redistributions of source code must retain the above copyright
  +#    notice, this list of conditions and the following disclaimer.
  +#
  +# 2. Redistributions in binary form must reproduce the above copyright
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. The end-user documentation included with the redistribution,
  +#    if any, must include the following acknowledgment:
  +#       "This product includes software developed by the
  +#        Apache Software Foundation (http://www.apache.org/)."
  +#    Alternately, this acknowledgment may appear in the software itself,
  +#    if and wherever such third-party acknowledgments normally appear.
  +#
  +# 4. The names "Apache" and "Apache Software Foundation" must
  +#    not be used to endorse or promote products derived from this
  +#    software without prior written permission. For written
  +#    permission, please contact apache@apache.org.
  +#
  +# 5. Products derived from this software may not be called "Apache",
  +#    nor may "Apache" appear in their name, without prior written
  +#    permission of the Apache Software Foundation.
  +#
  +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  +# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  +# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +# SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# individuals on behalf of the Apache Software Foundation.  For more
  +# information on the Apache Software Foundation, please see
  +# <http://www.apache.org/>.
  +#
   
  -BUILD_BASE=`pwd`
  -export BUILD_BASE
  +# buildconf: Build the support scripts needed to compile from a
  +#            checked-out version of the source code.
   
  +#
  +# Check to be sure that we have the srclib dependencies checked-out
  +#
  +if [ ! -d srclib/apr -o ! -f srclib/apr/build/apr_common.m4 ]; then
  +    echo ""
  +    echo "You don't have a srclib/apr/ subdirectory.  Please get one:"
  +    echo ""
  +    echo "   cd srclib"
  +    echo "   cvs -d :pserver:anoncvs@apache.org:/home/cvspublic login"
  +    echo "      (password 'anoncvs')"
  +    echo "   cvs -d :pserver:anoncvs@apache.org:/home/cvspublic co apr"
  +    echo ""
  +    exit 1
  +fi
  +if [ ! -d srclib/apr-util -o ! -f srclib/apr-util/Makefile.in ]; then
  +    echo ""
  +    echo "You don't have a srclib/apr-util/ subdirectory.  Please get one:"
  +    echo ""
  +    echo "   cd srclib"
  +    echo "   cvs -d :pserver:anoncvs@apache.org:/home/cvspublic login"
  +    echo "      (password 'anoncvs')"
  +    echo "   cvs -d :pserver:anoncvs@apache.org:/home/cvspublic co apr-util"
  +    echo ""
  +    exit 1
  +fi
  +
  +# These are temporary until Roy finishes the other build changes
  +#
  +touch .deps
  +rm -f aclocal.m4
   rm -f generated_lists
   
   case "`uname`" in
   *BSD/OS*)
       ./build/bsd_makefile;;
   esac
  +#
  +# end temporary stuff
  +
  +apr_configure="srclib/apr/configure"
  +aprutil_configure="srclib/apr-util/configure"
  +pcre_configure="srclib/pcre/configure"
  +config_h_in="include/ap_config_auto.h.in"
  +
  +cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
  +
  +echo rebuilding $apr_configure
  +(cd srclib/apr && ./buildconf)
  +
  +echo rebuilding $aprutil_configure
  +(cd srclib/apr-util && ./buildconf.sh)
  +
  +echo rebuilding $pcre_configure
  +(cd srclib/pcre && autoconf)
  +
  +echo rebuilding $config_h_in
  +rm -f $config_h_in
  +autoheader 2>&1 | grep -v "$cross_compile_warning"
  +
  +echo rebuilding configure
  +rm -f config.cache
  +autoconf 2>&1 | grep -v "$cross_compile_warning"
   
  -${MAKE:-make} -f build/build.mk ${1+"$@"}
  +exit 0
  
  
  
  1.133     +14 -6     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- configure.in	2001/03/24 07:43:25	1.132
  +++ configure.in	2001/03/24 09:43:05	1.133
  @@ -9,7 +9,18 @@
   
   AC_CONFIG_HEADER(include/ap_config_auto.h)
   AC_CONFIG_AUX_DIR(srclib/apr/build)
  - 
  +
  +dnl #
  +dnl # Include our own M4 macros along with those for APR and libtool
  +dnl #
  +sinclude(srclib/apr/build/apr_common.m4)
  +sinclude(srclib/apr/build/apr_network.m4)
  +sinclude(srclib/apr/build/apr_threads.m4)
  +sinclude(srclib/apr/build/apr_hints.m4)
  +sinclude(srclib/apr/build/libtool.m4)
  +sinclude(hints.m4)
  +sinclude(acinclude.m4)
  +
   dnl Generate ./config.nice for reproducing runs of configure
   dnl
   APACHE_CONFIG_NICE(config.nice)
  @@ -20,9 +31,6 @@
   dnl Absolute source/build directory
   abs_srcdir=`(cd $srcdir && pwd)`
   abs_builddir=`pwd`
  -aprbuild=$abs_srcdir/srclib/apr/build
  -
  -MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh
   
   dnl If the source dir is not equal to the build dir, 
   dnl then we are running in VPATH mode.
  @@ -154,7 +162,7 @@
   APACHE_LIBTOOL_SILENT
   
   if test "$apache_need_shared" = "yes"; then
  -  $SHELL $aprbuild/ltconfig --output=shlibtool --disable-static --srcdir=$aprbuild --cache-file=./config.cache
$aprbuild/ltmain.sh
  +  $SHELL $ac_aux_dir/ltconfig --output=shlibtool --disable-static --srcdir=$ac_aux_dir
--cache-file=./config.cache $ac_aux_dir/ltmain.sh
     case $PLATFORM in
       *os390)
         CFLAGS="$CFLAGS -Wc,DLL,EXPORTALL"
  @@ -267,7 +275,7 @@
   AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
   	[Location of the source for the current MPM])
   
  -perlbin=`$srcdir/build/PrintPath perl`
  +perlbin=`$ac_aux_dir/PrintPath perl`
   AC_SUBST(perlbin)
   
   dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
  
  
  

Mime
View raw message