rse         98/08/15 08:02:46

  Modified:    src      CHANGES
               .        configure
  Log:
  Make sure the config.status file is not overridden when just
  ``configure --help'' is used.
  
  PR: 2844
  
  Revision  Changes    Path
  1.1026    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1025
  retrieving revision 1.1026
  diff -u -r1.1025 -r1.1026
  --- CHANGES   1998/08/14 03:00:15     1.1025
  +++ CHANGES   1998/08/15 15:02:44     1.1026
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.2
   
  +  *) Make sure the config.status file is not overridden when just
  +     ``configure --help'' is used. [Ralf S. Engelschall] PR#2844
  +
     *) Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should
        provide a way to trace API changes that add functionality but do
        not create a compatibility issue for precompiled modules, etc.
  
  
  
  1.43      +36 -33    apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- configure 1998/07/28 17:26:45     1.42
  +++ configure 1998/08/15 15:02:46     1.43
  @@ -81,10 +81,11 @@
   ##  pre-determine runtime modes
   ##
   
  +help=no
   quiet=no
   verbose=no
   case "$*" in
  -    --help|*--help|*--help* ) quiet=yes ;;
  +    --help|*--help|*--help* ) help=yes; quiet=yes ;;
       --quiet|*--quiet|*--quiet* ) quiet=yes ;;
       --verbose|*--verbose|*--verbose*|-v|*-v|*-v* ) verbose=yes ;;
       * ) ;;
  @@ -267,40 +268,42 @@
   
   #   create a config status script for restoring
   #   the configuration via a simple shell script
  -rm -f $configstatus 2>/dev/null
  -echo "#!/bin/sh" >$configstatus
  -echo "##" >>$configstatus
  -echo "##  $configstatus -- APACI auto-generated configuration restore 
script" >>$configstatus
  -echo "##" >>$configstatus
  -echo "##  Use this shell script to re-run the APACI configure script for" 
>>$configstatus
  -echo "##  restoring your configuration. Additional parameters can be 
supplied." >>$configstatus
  -echo "##" >>$configstatus
  -echo "" >>$configstatus
  -for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
  -           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
  -    eval "val=\"\$$var\""
  -    if [ ".$val" != . ]; then
  -        echo "$var=$val" |\
  -        sed -e 's:\(["$\\]\):\\\1:g' \
  -            -e 's:\([A-Z]*=\):\1":' \
  -            -e 's:$:" \\:' >>$configstatus
  -    fi
  -done
  -if [ $# -eq 0 ]; then
  -    echo "./configure" >>$configstatus
  -else
  -    echo $SEO "./configure \\" >>$configstatus
  -    for arg
  -    do
  -        echo "$arg" |\
  -        sed -e 's:\(["$\\]\):\\\1:g' \
  -            -e 's:^:":' \
  -            -e 's:$:" \\:' >>$configstatus
  +if [ ".$help" = .no ]; then
  +    rm -f $configstatus 2>/dev/null
  +    echo "#!/bin/sh" >$configstatus
  +    echo "##" >>$configstatus
  +    echo "##  $configstatus -- APACI auto-generated configuration restore 
script" >>$configstatus
  +    echo "##" >>$configstatus
  +    echo "##  Use this shell script to re-run the APACI configure script 
for" >>$configstatus
  +    echo "##  restoring your configuration. Additional parameters can be 
supplied." >>$configstatus
  +    echo "##" >>$configstatus
  +    echo "" >>$configstatus
  +    for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
  +               LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
  +        eval "val=\"\$$var\""
  +        if [ ".$val" != . ]; then
  +            echo "$var=$val" |\
  +            sed -e 's:\(["$\\]\):\\\1:g' \
  +                -e 's:\([A-Z]*=\):\1":' \
  +                -e 's:$:" \\:' >>$configstatus
  +        fi
       done
  +    if [ $# -eq 0 ]; then
  +        echo "./configure" >>$configstatus
  +    else
  +        echo $SEO "./configure \\" >>$configstatus
  +        for arg
  +        do
  +            echo "$arg" |\
  +            sed -e 's:\(["$\\]\):\\\1:g' \
  +                -e 's:^:":' \
  +                -e 's:$:" \\:' >>$configstatus
  +        done
  +    fi
  +    echo '$*' >>$configstatus
  +    echo '' >>$configstatus
  +    chmod a+x $configstatus
   fi
  -echo '$*' >>$configstatus
  -echo '' >>$configstatus
  -chmod a+x $configstatus
   
   ##
   ##  parse argument line options
  
  
  

Reply via email to