You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rs...@hyperreal.org on 1998/04/01 15:16:40 UTC

cvs commit: apache-1.3/conf httpd.conf-dist

rse         98/04/01 05:16:40

  Modified:    .         Makefile.tmpl
               conf      httpd.conf-dist
  Log:
  Make sure at least one LoadModule line exists and that it's really just an
  example and not a real one. Because the real ones are automatically added by
  APACI's "make install" procedure.
  
  Revision  Changes    Path
  1.7       +1 -2      apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1998/04/01 11:39:56	1.6
  +++ Makefile.tmpl	1998/04/01 13:16:38	1.7
  @@ -292,8 +292,7 @@
            echo "##"; \
   		 echo ""; \
   		 cat $(ROOT)/conf/$$conf-dist ) |\
  -    	sed -e '/#LoadModule/d' \
  -    	    -e '/_before_ they are used./r .install.conf' \
  +    	sed -e '/# LoadModule/r .install.conf' \
       	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
       	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
           	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
  
  
  
  1.25      +2 -1      apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- httpd.conf-dist	1998/03/29 19:11:57	1.24
  +++ httpd.conf-dist	1998/04/01 13:16:39	1.25
  @@ -12,7 +12,8 @@
   # as a shared object you have to place corresponding `LoadModule'
   # lines at this location so the directives contained in it are
   # actually available _before_ they are used. 
  -#LoadModule config_log_module libexec/mod_log_config.so
  +# Example:
  +# LoadModule foo_module libexec/mod_foo.so
   
   # ServerType is either inetd, or standalone.