httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@hyperreal.com>
Subject cvs commit: apache/src Configure
Date Tue, 17 Dec 1996 20:21:41 GMT
randy       96/12/17 12:21:41

  Modified:    src       Configure
  Log:
  Add more flexibility to the configuration process.
  Reviewed by:	Randy Terbush, Sameer Parekh, Ben Laurie
  Submitted by:	Rob Hartill
  
  Revision  Changes    Path
  1.58      +16 -9     apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -C3 -r1.57 -r1.58
  *** Configure	1996/12/12 00:30:37	1.57
  --- Configure	1996/12/17 20:21:39	1.58
  ***************
  *** 16,28 ****
    
    file=Configuration
    tmpfile=htconf.$$
    
  ! if [ "x$1" = "x-file" ] ; then
  !   echo "Using alternate config file $2"
  !   file=$2 
  ! else
  !   echo "Using '$file' as config file"
  ! fi
    
    if [ ! -r $file ]; then
      echo "Can't see or read \"$file\""
  --- 16,35 ----
    
    file=Configuration
    tmpfile=htconf.$$
  + makefile_tmpl=Makefile.tmpl
    
  ! while [ "x$1" != "x" ]; do
  !   if [ "x$1" = "x-file" ] ; then
  !     shift 1; file=$1; shift 1
  !   elif [ "x$1" = "x-make" ] ; then
  !     shift 1; makefile_tmpl=$1; shift 1
  !   else
  !     echo "Ignoring command line option '$1'"
  !     shift 1
  !   fi
  ! done
  ! echo "Using config file: $file"
  ! echo "Using Makefile template file: $makefile_tmpl"
    
    if [ ! -r $file ]; then
      echo "Can't see or read \"$file\""
  ***************
  *** 84,91 ****
    #
    # Add module set only
    #
  ! awk >Makefile <$tmpfile '\
  !    BEGIN { print "# Makefile automatically generated from Makefile.tmpl"; \
    	   print "# and configuration file by Apache config script. "; \
    	   print "# Hand-edited changes will be lost if the config script"; \
    	   print "# is re-run."; \
  --- 91,98 ----
    #
    # Add module set only
    #
  ! awk -v make=$makefile_tmpl >Makefile <$tmpfile '\
  !    BEGIN { printf "# Makefile automatically generated from %s\n", make; \
    	   print "# and configuration file by Apache config script. "; \
    	   print "# Hand-edited changes will be lost if the config script"; \
    	   print "# is re-run."; \
  ***************
  *** 485,489 ****
    echo "#### End of Configure created section ####">> Makefile
    echo >> Makefile
    
  ! cat Makefile.tmpl >> Makefile
    
  --- 492,496 ----
    echo "#### End of Configure created section ####">> Makefile
    echo >> Makefile
    
  ! cat "$makefile_tmpl" >> Makefile
    
  
  
  

Mime
View raw message