cvs commit: apache/src/helpers CutRule GuessOS GuessWhere

[Jim Jagielski <ji...@hyperreal.com>]

jim         96/10/23 05:56:35

  Modified:    src       Configure
  Added:       src/helpers  CutRule GuessOS GuessWhere
  Removed:     src       CutRule GuessOS GuessWhere
  Log:
  Move Configure scripts into their own sub-dir
  
  Revision  Changes    Path
  1.30      +12 -10    apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** Configure	1996/10/22 04:21:44	1.29
  --- Configure	1996/10/23 12:56:31	1.30
  ***************
  *** 1,5 ****
    #!/bin/sh
  ! # $Id: Configure,v 1.29 1996/10/22 04:21:44 akosut Exp $
    trap 'rm $tmpfile; exit' 0 1 2 3 15
    
    # Apache configuration script, first cut --- rst.
  --- 1,5 ----
    #!/bin/sh
  ! # $Id: Configure,v 1.30 1996/10/23 12:56:31 jim Exp $
    trap 'rm $tmpfile; exit' 0 1 2 3 15
    
    # Apache configuration script, first cut --- rst.
  ***************
  *** 11,17 ****
    # modules and "rules". These rules are used to allow Configure to
    # be totally configured from Configuration
    #
  ! # Uses 2 supplemental scripts: CutRule and GuessOS
    
    file=Configuration
    tmpfile=htconf.$$
  --- 11,19 ----
    # modules and "rules". These rules are used to allow Configure to
    # be totally configured from Configuration
    #
  ! # Uses 3 supplemental scripts located in ./helpers: CutRule,
  ! # GuessOS and GuessWhere
  ! #
    
    file=Configuration
    tmpfile=htconf.$$
  ***************
  *** 109,118 ****
    #
    # Extract the rules.
    #
  ! RULE_WANTHSREGEX=`./CutRule WANTHSREGEX $file`
  ! RULE_STATUS=`./CutRule STATUS $file`
  ! RULE_SOCKS4=`./CutRule SOCKS4 $file`
  ! RULE_IRIXNIS=`./CutRule IRIXNIS $file`
    
    #
    # Now we determine the OS/Platform automagically, thanks to
  --- 111,120 ----
    #
    # Extract the rules.
    #
  ! RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file`
  ! RULE_STATUS=`./helpers/CutRule STATUS $file`
  ! RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
  ! RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
    
    #
    # Now we determine the OS/Platform automagically, thanks to
  ***************
  *** 129,135 ****
    # add the required lines below.
    #
    
  ! PLAT=`./GuessOS`
    
    # Preset DBM_LIB. Can be overridden on a per-platform basis.
    
  --- 131,137 ----
    # add the required lines below.
    #
    
  ! PLAT=`./helpers/GuessOS`
    
    # Preset DBM_LIB. Can be overridden on a per-platform basis.
    
  ***************
  *** 301,309 ****
    # set above. If so, then we honor that; if not, then we set some
    # defaults (gcc and -O2)
    #
  ! COMPILER=`./GuessWhere gcc`
    if [ "$COMPILER" = "not found" ]; then
  !     COMPILER=`./GuessWhere cc`
    fi
    
    if grep "CC=" Makefile > /dev/null; then
  --- 303,311 ----
    # set above. If so, then we honor that; if not, then we set some
    # defaults (gcc and -O2)
    #
  ! COMPILER=`./helpers/GuessWhere gcc`
    if [ "$COMPILER" = "not found" ]; then
  !     COMPILER=`./helpers/GuessWhere cc`
    fi
    
    if grep "CC=" Makefile > /dev/null; then
  ***************
  *** 370,376 ****
    #
    # Look for ranlib
    #
  ! RANLIB=`./GuessWhere ranlib`
    
    #
    # Good enough
  --- 372,378 ----
    #
    # Look for ranlib
    #
  ! RANLIB=`./helpers/GuessWhere ranlib`
    
    #
    # Good enough