httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.org>
Subject cvs commit: apachen/src CHANGES Configure INSTALL
Date Wed, 27 Aug 1997 01:12:23 GMT
jim         97/08/26 18:12:22

  Modified:    src      CHANGES Configure INSTALL
  Log:
  Depreciate the -make option for Configure. We now create Makefile
  on the fly and depend on the existance of Makefile.tmpl.
  
  Revision  Changes    Path
  1.422     +3 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.421
  retrieving revision 1.422
  diff -u -r1.421 -r1.422
  --- CHANGES	1997/08/26 00:00:50	1.421
  +++ CHANGES	1997/08/27 01:12:18	1.422
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3a2
   
  +  *) Configure no longer accepts the -make option, since it creates
  +     Makefile on the fly based on Makefile.tmpl and Configuration.
  +
     *) Apache now gracefully shuts down when it receives a SIGTERM, instead
        of forcibly killing off all its processes and exiting without
        cleaning up. [Alexei Kosut]
  
  
  
  1.143     +5 -12     apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- Configure	1997/08/26 01:02:51	1.142
  +++ Configure	1997/08/27 01:12:19	1.143
  @@ -24,12 +24,11 @@
   tmpfile=htconf.$$
   tmpfile2=$tmpfile.2
   tmpfile3=$tmpfile.3
  -makefile_tmpl=Makefile.tmpl
   SRCDIR=`pwd`
   
   ####################################################################
  -## Now handle any arguments, which, for now, are -file and -make
  -## to select alternate Configuration and Makefile.tmpl files
  +## Now handle any arguments, which, for now, is -file
  +## to select an alternate Configuration file
   ##
   while [ "x$1" != "x" ]; do
     if [ "x$1" = "x-file" ] ; then
  @@ -38,19 +37,12 @@
         echo "$file does not exist or is not readable."
         exit 1
       fi
  -  elif [ "x$1" = "x-make" ] ; then
  -    shift 1; makefile_tmpl=$1; shift 1
  -    if [ ! -r $makefile_tmpl ]; then
  -      echo "$makefile_tmpl does not exist or is not readable."
  -      exit 1
  -    fi
     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\""
  @@ -104,8 +96,9 @@
   # Start creating the Makefile. We add some comments and
   # then fold in the modules that were included in Configuration
   #
  +echo "Creating Makefile"
   echo "#" > Makefile
  -echo "# Makefile automatically generated from $makefile_tmpl" >> Makefile
  +echo "# Makefile automatically generated from Makefile.tmpl" >> Makefile
   echo "# and configuration file by Apache config script." >> Makefile
   echo "# Hand-edited changes will be lost if the config script" >> Makefile
   echo "# is re-run" >> Makefile
  @@ -893,7 +886,7 @@
   # ./Makefile
   #
   cat Makefile.config >> Makefile
  -sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
  +sed -e "s#@@Configuration@@#$file#" "Makefile.tmpl" >>Makefile
   awk >>Makefile <$tmpfile \
      '($1 == "Module" && $3 ~ /modules\//) { printf "%s: modules/last-built ; @cat
/dev/null\n\n", $3, $3}'
   
  
  
  
  1.18      +14 -6     apachen/src/INSTALL
  
  Index: INSTALL
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/INSTALL,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- INSTALL	1997/08/09 00:55:52	1.17
  +++ INSTALL	1997/08/27 01:12:19	1.18
  @@ -28,10 +28,15 @@
   
         % ./Configure
         Using config file: Configuration
  -      Using Makefile template file: Makefile.tmpl
  +      Creating Makefile
          + configured for <whatever> platform
  -       + setting C compiler to <whatever> *
  +       + setting C compiler to <whatever>
  +       + Adding selected modules
          + doing sanity check on compiler and options
  +      Creating Makefile in support
  +      Creating Makefile in main
  +      Creating Makefile in os/unix
  +      Creating Makefile in modules/standard
         %
   
      This generates new versions of the Makefile and of modules.c.  (If
  @@ -39,14 +44,17 @@
   
         % ./Configure -file Configuration.ai
         Using config file: Configuration.ai
  -      Using Makefile template file: Makefile.tmpl
  +      Creating Makefile
          + configured for <whatever> platform
  -       + setting C compiler to <whatever> *
  +       + setting C compiler to <whatever>
  +       + Adding selected modules
          + doing sanity check on compiler and options
  +      Creating Makefile in support
  +      Creating Makefile in main
  +      Creating Makefile in os/unix
  +      Creating Makefile in modules/standard
         % 
   
  -   (*: Depending on Configuration and your system, Configure
  -       may not print these lines. That's OK)
   
   3) Type "make".
   
  
  
  

Mime
View raw message