You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1997/11/03 05:33:19 UTC

cvs commit: apachen/src CHANGES Configure

dgaudet     97/11/02 20:33:19

  Modified:    src      CHANGES Configure
  Log:
  Warn user about default path change if /usr/local/etc/httpd is found.
  
  Submitted by:	Lars Eilebrecht
  Reviewed by:	Martin Kraemer, Dean Gaudet
  
  Revision  Changes    Path
  1.483     +3 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.482
  retrieving revision 1.483
  diff -u -r1.482 -r1.483
  --- CHANGES	1997/10/30 19:20:48	1.482
  +++ CHANGES	1997/11/03 04:33:16	1.483
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b3
   
  +  *) Warn user that default path has changed if /usr/local/etc/httpd
  +     is found on the system.  [Lars Eilebrecht]
  +
     *) Various mod_mime_magic bug fixes and cleanups: Uncompression
        should work, it should work on WIN32, and a few resource
        leaks and abort conditions are fixed.
  
  
  
  1.166     +18 -0     apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.165
  retrieving revision 1.166
  diff -u -r1.165 -r1.166
  --- Configure	1997/10/27 19:10:33	1.165
  +++ Configure	1997/11/03 04:33:17	1.166
  @@ -98,6 +98,24 @@
   if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi
   
   ####################################################################
  +# If we find the directory /usr/local/etc/httpd and there is
  +# no HTTPD_ROOT flag set in the Configuration file we assume
  +# that the user was using the old default root directory
  +# and issue a notice about it.
  +#
  +
  +test ! -d /usr/local/etc/httpd/ \
  + || if ! egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null
  +    then
  +      echo " | Please note that the default httpd root directory has changed"
  +      echo " | from '/usr/local/etc/httpd/' to '/usr/local/apache/.'"
  +      echo " | You may add '-DHTTPD_ROOT=\\\"/usr/local/etc/httpd\\\"' to EXTRA_CFLAGS"
  +      echo " | in your Configuration file (and re-run Configure) or start"
  +      echo " | httpd with the option '-d /usr/local/etc/httpd' if you still"
  +      echo " | want to use the old root directory for your server."
  +    fi
  +
  +####################################################################
   # Start creating the Makefile. We add some comments and
   # then fold in the modules that were included in Configuration
   #