fielding 01/03/23 22:50:34
Modified: . buildconf configure.in Log: Move the build tool check into APR and improve the comments. This is in preparation of APR being the center of all builds. Revision Changes Path 1.12 +76 -4 apr/buildconf Index: buildconf =================================================================== RCS file: /home/cvs/apr/buildconf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- buildconf 2001/03/24 06:00:39 1.11 +++ buildconf 2001/03/24 06:50:34 1.12 @@ -1,6 +1,71 @@ #!/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 [EMAIL PROTECTED] +# +# 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/>. +# + +# buildconf: Build the support scripts needed to compile from a +# checked-out version of the source code. +# Verify that the builder has the right config tools installed # +build/buildcheck.sh || exit 1 + +libtoolize=`build/PrintPath glibtoolize libtoolize` +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi + # Create the libtool helper files # # Note: we copy (rather than link) them to simplify distribution. @@ -8,12 +73,17 @@ # rely on libtool's versions # echo "Copying libtool helper files ..." -# -libtoolize=`build/PrintPath glibtoolize libtoolize` + +$libtoolize --copy --automake + ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 -cp -f $ltfile build/ -$libtoolize --copy --automake + +if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 +fi +cp -f $ltfile build/libtool.m4 # # Generate the autoconf header and ./configure @@ -26,3 +96,5 @@ autoconf (cd shmem/unix/mm && autoconf) + +exit 0 1.259 +8 -4 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- configure.in 2001/03/24 06:00:39 1.258 +++ configure.in 2001/03/24 06:50:34 1.259 @@ -1,12 +1,16 @@ -dnl ## -dnl ## Autoconf configuration file for APR -dnl ## +dnl # +dnl # Autoconf configuration file for APR +dnl # +dnl # Process this file with autoconf to produce a configure script. +dnl # Use ./buildconf to prepare build files and run autoconf for APR. -dnl Process this file with autoconf to produce a configure script. AC_INIT(build/apr_common.m4) AC_CONFIG_HEADER(include/arch/unix/apr_private.h) AC_CONFIG_AUX_DIR(build) +dnl # +dnl # Include our own M4 macros along with those for libtool +dnl # sinclude(build/apr_common.m4) sinclude(build/apr_network.m4) sinclude(build/apr_threads.m4)
