Commit 9cb9c3e7 authored by Joe Orton's avatar Joe Orton
Browse files

Backport from HEAD:

* buildconf: Ensure that make never regenerates the mod_ssl expression
parser files from the lex/yacc sources.

* buildconf: Clean autoconf cache after running autoconf too.

* build/config.guess, build/config.sub: Remove since buildconf copies
these files from APR.

Reviewed by: trawick, jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105211 13f79535-47bb-0310-9956-ffa450edef68
parent 49ad20c2
Loading
Loading
Loading
Loading
+1 −9
Original line number Diff line number Diff line
APACHE 2.0 STATUS:                                              -*-text-*-
Last modified at [$Date: 2004/09/19 23:16:32 $]
Last modified at [$Date: 2004/09/20 13:25:46 $]

Release:

@@ -87,14 +87,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/ldap/util_ldap_cache_mgr.c: 1.7
       +1: minfrin

    *) buildconf: Clean autoconf cache and do mod_ssl timestamp dance.
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/buildconf?r1=1.37&r2=1.40
       +1: jorton, trawick, jerenkrantz

    *) remove config.{guess,sub} and PrintPath from build (they are copied
       by buildconf already)
       +1: jorton, trawick, jerenkrantz

    *) Use HTML 2.0 <hr> for error pages. PR 30732
         modules/http/http_protocol.c: r1.483
       +1: nd, jorton, trawick, jerenkrantz
+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ find_apr.m4
find_apu.m4
ltconfig
ltmain.sh
config.guess
config.sub
PrintPath

build/PrintPath

deleted100755 → 0
+0 −129
Original line number Diff line number Diff line
#!/bin/sh
#
# Copyright 1999-2004 The Apache Software Foundation
#
# 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
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# 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.
#
#
# Look for program[s] somewhere in $PATH.
#
# Options:
#  -s
#    Do not print out full pathname. (silent)
#  -pPATHNAME
#    Look in PATHNAME instead of $PATH
#
# Usage:
#  PrintPath [-s] [-pPATHNAME] program [program ...]
#
# Initially written by Jim Jagielski for the Apache configuration mechanism
#  (with kudos to Kernighan/Pike)

##
# Some "constants"
##
pathname=$PATH
echo="yes"

##
# Find out what OS we are running for later on
##
os=`(uname) 2>/dev/null`

##
# Parse command line
##
for args in $*
do
    case $args in
	-s  ) echo="no" ;;
	-p* ) pathname="`echo $args | sed 's/^..//'`" ;;
	*   ) programs="$programs $args" ;;
    esac
done

##
# Now we make the adjustments required for OS/2 and everyone
# else :)
#
# First of all, all OS/2 programs have the '.exe' extension.
# Next, we adjust PATH (or what was given to us as PATH) to
# be whitespace separated directories.
# Finally, we try to determine the best flag to use for
# test/[] to look for an executable file. OS/2 just has '-r'
# but with other OSs, we do some funny stuff to check to see
# if test/[] knows about -x, which is the prefered flag.
##

if [ "x$os" = "xOS/2" ]
then
    ext=".exe"
    pathname=`echo -E $pathname |
     sed 's/^;/.;/
	  s/;;/;.;/g
	  s/;$/;./
	  s/;/ /g
	  s/\\\\/\\//g' `
    test_exec_flag="-r"
else
    ext=""	# No default extensions
    pathname=`echo $pathname |
     sed 's/^:/.:/
	  s/::/:.:/g
	  s/:$/:./
	  s/:/ /g' `
    # Here is how we test to see if test/[] can handle -x
    testfile="pp.t.$$"

    cat > $testfile <<ENDTEST
#!/bin/sh
if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
    exit 0
fi
exit 1
ENDTEST

    if `/bin/sh $testfile 2>/dev/null`; then
	test_exec_flag="-x"
    else
	test_exec_flag="-r"
    fi
    rm -f $testfile
fi

for program in $programs
do
    for path in $pathname
    do
	if [ $test_exec_flag $path/${program}${ext} ] && \
	   [ ! -d $path/${program}${ext} ]; then
	    if [ "x$echo" = "xyes" ]; then
		echo $path/${program}${ext}
	    fi
	    exit 0
	fi

# Next try without extension (if one was used above)
	if [ "x$ext" != "x" ]; then
            if [ $test_exec_flag $path/${program} ] && \
               [ ! -d $path/${program} ]; then
                if [ "x$echo" = "xyes" ]; then
                    echo $path/${program}
                fi
                exit 0
            fi
        fi
    done
done
exit 1

build/config.guess

deleted100755 → 0
+0 −1344

File deleted.

Preview size limit exceeded, changes collapsed.

build/config.sub

deleted100755 → 0
+0 −1513

File deleted.

Preview size limit exceeded, changes collapsed.

Loading