jorton      2004/09/01 02:56:56

  Modified:    .        Tag: APR_0_9_BRANCH buildconf apr-config.in
  Log:
  * buildconf, apr-config.in: Relicense.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.26.2.1  +13 -51    apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.26
  retrieving revision 1.26.2.1
  diff -d -w -u -r1.26 -r1.26.2.1
  --- buildconf	17 Jun 2003 20:44:25 -0000	1.26
  +++ buildconf	1 Sep 2004 09:56:56 -0000	1.26.2.1
  @@ -1,56 +1,18 @@
   #!/bin/sh
  -# ====================================================================
  -# The Apache Software License, Version 1.1
  -#
  -# Copyright (c) 2000-2003 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.
  +# Copyright 2000-2004 The Apache Software Foundation
   #
  -# 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.
  +# Licensed under the Apache License, Version 2.0 (the "License");
  +# you may not use this file except in compliance with the License.
  +# You may obtain a copy of the License at
   #
  -# 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.
  +#    http://www.apache.org/licenses/LICENSE-2.0
   #
  -# 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.
  -# ====================================================================
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed under the License is distributed on an "AS IS" BASIS,
  +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
   #
  -# 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
  
  
  
  1.36.2.3  +13 -51    apr/apr-config.in
  
  Index: apr-config.in
  ===================================================================
  RCS file: /home/cvs/apr/apr-config.in,v
  retrieving revision 1.36.2.2
  retrieving revision 1.36.2.3
  diff -d -w -u -r1.36.2.2 -r1.36.2.3
  --- apr-config.in	1 Sep 2004 09:53:50 -0000	1.36.2.2
  +++ apr-config.in	1 Sep 2004 09:56:56 -0000	1.36.2.3
  @@ -1,56 +1,18 @@
   #!/bin/sh
  -# ====================================================================
  -# The Apache Software License, Version 1.1
  -#
  -# Copyright (c) 2001-2003 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.
  +# Copyright 2001-2004 The Apache Software Foundation
   #
  -# 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.
  +# Licensed under the Apache License, Version 2.0 (the "License");
  +# you may not use this file except in compliance with the License.
  +# You may obtain a copy of the License at
   #
  -# 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.
  +#    http://www.apache.org/licenses/LICENSE-2.0
   #
  -# 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.
  -# ====================================================================
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed under the License is distributed on an "AS IS" BASIS,
  +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
   #
  -# 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/>.
   
   # APR script designed to allow easy command line access to APR configuration
   # parameters.