httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3 INSTALL STATUS configure Makefile.tmpl
Date Wed, 01 Apr 1998 11:28:39 GMT
rse         98/04/01 03:28:38

  Modified:    src       CHANGES
               .         INSTALL STATUS configure Makefile.tmpl
  Log:
  Just a little APACI option to provide a way for the user to install Apache
  without the support tools when he has problems with it (for instance compiling
  them or no Perl interpreter installed, etc).
  
  Revision  Changes    Path
  1.752     +6 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.751
  retrieving revision 1.752
  diff -u -r1.751 -r1.752
  --- CHANGES	1998/03/31 15:46:14	1.751
  +++ CHANGES	1998/04/01 11:28:29	1.752
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3b6
   
  +  *) Provide APACI --without-support option to be able to disable the build
  +     and installation of the support tools from the src/support/ area.
  +     Although its useful to have these installed per default we should provide
  +     a way to compile and install without them for backward-compatibility.
  +     [Ralf S. Engelschall]
  +
     *) Add of the new APache eXtenSion (apxs) support tool for building and
        installing modules into an _already installed_ Apache package through the
        dynamic shared object (DSO) mechanism [mod_so.c]. The trick here is that
  
  
  
  1.2       +9 -4      apache-1.3/INSTALL
  
  Index: INSTALL
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/INSTALL,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- INSTALL	1998/03/29 12:27:28	1.1
  +++ INSTALL	1998/04/01 11:28:32	1.2
  @@ -82,10 +82,10 @@
                                  [--sysconfdir=DIR]     [--enable-shared=NAME]  
                                  [--datadir=DIR]        [--disable-shared=NAME] 
                                  [--localstatedir=DIR]  
  -                               [--compat]             [--with-perl=FILE]    
  -                                                      [--enable-suexec]
  -                                                      [--suexec-caller=UID]
  -                                                      [--suexec-userdir=DIR]
  +                               [--compat]             [--enable-suexec]     
  +                                                      [--suexec-caller=UID] 
  +                               [--with-perl=FILE]     [--suexec-userdir=DIR]
  +                               [--without-support]    
   
       Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB,
       LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment variables to
  @@ -155,6 +155,11 @@
       executable to be used with Apache. Per default APACI tries to find it
       automatically. But if multiple Perl instances exist on your system you
       have to select the correct one manually.
  +
  +    Use the --without-support option to explicitly disable the build and
  +    installation of support tools from the src/support/ area. This can be
  +    useful when you have compilation problems with one or more of these not
  +    programs on your platform or if you just don't need them.
   
       Use the --enable-suexec option to enable the suEXEC feature by building
       and installing the "suexec" support program. Use --suexec-caller=UID to
  
  
  
  1.251     +1 -0      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- STATUS	1998/03/31 15:46:08	1.250
  +++ STATUS	1998/04/01 11:28:33	1.251
  @@ -132,6 +132,7 @@
       * Rainer Scherg's fix for CONNECT proxy support: #1326, #1573, #1942
       * Ken's reworking of the Apache LICENSE
       * Ralf's APache eXtenSion for easy "off-source" extending Apache via DSO
  +    * Ralf's APACI --without-support option
   
   Available Patches:
   
  
  
  
  1.5       +27 -1     apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- configure	1998/03/31 15:46:10	1.4
  +++ configure	1998/04/01 11:28:36	1.5
  @@ -149,6 +149,9 @@
   suexec_caller=www
   suexec_userdir=public_html
   
  +#   with support tools
  +support=1
  +
   #   determine rules
   rules=""
   rulelist=""
  @@ -289,6 +292,7 @@
               echo " --enable-shared=NAME   enable  build of Module named 'NAME' as a shared
object"
               echo " --disable-shared=NAME  disable build of Module named 'NAME' as a shared
object"
               echo " --with-perl=FILE       set the path to the optional Perl interpreter
to use"
  +            echo " --without-support      disable the build and installation of support
tools"
               echo ""
               echo "suEXEC options:"
               echo " --enable-suexec        enable the suEXEC feature"
  @@ -549,6 +553,9 @@
           --with-perl=*)
               PERL="$apc_optarg"
               ;;
  +        --without-support)
  +            support=0
  +            ;;
           --suexec-caller=*)
               suexec_caller="$apc_optarg"
               ;;
  @@ -599,6 +606,21 @@
   done
   
   ##
  +##  determine special configurable Makefile targets
  +##
  +if [ ".$support" = .1 ]; then
  +      build_support=build-support
  +    install_support=install-support
  +      clean_support=clean-support
  +  distclean_support=distclean-support
  +else
  +      build_support=
  +    install_support=
  +      clean_support=
  +  distclean_support=
  +fi
  +
  +##
   ##  determine prefix-relative paths for directories
   ##  because Apache supports them for the -d and -f 
   ##  options, the LoadModule directive, etc.
  @@ -671,7 +693,11 @@
   -e "s%@includedir@%$includedir%g" \
   -e "s%@suexec@%$suexec%g" \
   -e "s%@suexec_caller@%$suexec_caller%g" \
  --e "s%@suexec_userdir@%$suexec_userdir%g"
  +-e "s%@suexec_userdir@%$suexec_userdir%g" \
  +-e "s%@build_support@%$build_support%g" \
  +-e "s%@install_support@%$install_support%g" \
  +-e "s%@clean_support@%$clean_support%g" \
  +-e "s%@distclean_support@%$distclean_support%g"
   
   ##
   ##  override default paths in $src/include/httpd.h
  
  
  
  1.5       +44 -19    apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl	1998/03/31 15:46:11	1.4
  +++ Makefile.tmpl	1998/04/01 11:28:37	1.5
  @@ -105,6 +105,12 @@
   suexec_caller   = @suexec_caller@
   suexec_userdir  = @suexec_userdir@
   
  +#   usage of src/support stuff
  +build-support     = @build_support@
  +install-support   = @install_support@
  +clean-support     = @clean_support@
  +distclean-support = @distclean_support@
  +
   #   list of shared objects which have to _ALWAYS_ be enabled
   #   per default in the config file because of the directives used
   #   in these default files.
  @@ -129,18 +135,27 @@
   ##                           Build Target
   ## ------------------------------------------------------------------
   
  -#   build the programs
  -build:
  +#   build the package
  +build: 
  +	@echo "===> $(SRC)"
  +	@$(MAKE) -f $(MKF) $(MFLAGS) build-std $(build-support)
  +	@touch $(SRC)/.build.ok
  +	@echo "<=== $(SRC)"
  +
  +#   build the standard stuff
  +build-std:
   	@cd $(SRC); $(MAKE) $(MFLAGS) all 2>&1 | sed -e 's:^\([=<]==[>=]\) :\1 $(SRC)/:'
  +
  +#   build the additional support stuff
  +build-support:
   	@echo "===> $(SRC)/support"; \
   	cd $(SRC)/support; $(MAKE) $(MFLAGS) all; \
   	if [ ".$(suexec)" = .1 ]; then \
   	    $(MAKE) $(MFLAGS) \
  -		    EXTRA_CFLAGS='-DHTTPD_USER=\"$(suexec_caller)\" -DUSERDIR_SUFFIX=\"$(suexec_userdir)\"'
\
  -			suexec; \
  +	            EXTRA_CFLAGS='-DHTTPD_USER=\"$(suexec_caller)\" -DUSERDIR_SUFFIX=\"$(suexec_userdir)\"'
\
  +	            suexec; \
   	fi; \
   	echo "<=== $(SRC)/support"
  -	@touch $(SRC)/.build.ok
   
   ## ------------------------------------------------------------------
   ##                       Installation Targets  
  @@ -154,12 +169,9 @@
   	    $(MAKE) -f $(MKF) $(MFLAGS) build; \
   	fi
   	@$(MAKE) -f $(MKF) $(MFLAGS) \
  -		install-mktree   \
  -		install-programs \
  -		install-support  \
  -		install-config   \
  -		install-include  \
  -		install-docroot 
  +	    install-mktree install-programs $(install-support) \
  +		install-config install-include \
  +		install-docroot
   	-@rm -f .install.tmp
   	-@rm -f .install.conf
   	-@if [ ".$(QUIET)" != .1 ]; then \
  @@ -327,7 +339,17 @@
   #   cleanup the source tree by removing anything which was
   #   created by the build target
   clean:
  +	@echo "===> $(SRC)"
  +	@$(MAKE) -f $(MKF) $(MFLAGS) clean-std $(clean-support)
  +	@rm -f $(SRC)/.build.ok
  +	@echo "<=== $(SRC)"
  +
  +#   clean the standard stuff
  +clean-std:
   	@cd $(SRC); $(MAKE) $(MFLAGS) clean | sed -e 's:^\([=<]==[>=]\) :\1 $(SRC)/:'
  +
  +#   clean additional support stuff
  +clean-support:
   	@echo "===> $(SRC)/support"; \
   	    cd $(SRC)/support; $(MAKE) $(MFLAGS) clean; \
   	    if [ ".$(suexec)" = .1 ]; then \
  @@ -335,7 +357,6 @@
   	        rm -f suexec; \
   	    fi; \
   	echo "<=== $(SRC)/support"
  -	@rm -f $(SRC)/.build.ok
   
   #   first cleanup with the clean target and then additionally
   #   remove anything the "configure" script has created, i.e.
  @@ -343,14 +364,18 @@
   #   we just remove the complete shadow tree.
   distclean:
   	@if [ ".$(SRC)" = .src ]; then \
  -		$(MAKE) -f $(MKF) $(MFLAGS) distclean-std; \
  +		$(MAKE) -f $(MKF) $(MFLAGS) distclean-normal; \
   	else \
   		$(MAKE) -f $(MKF) $(MFLAGS) distclean-shadow; \
   	fi
   
  +distclean-normal:
  +	@$(MAKE) -f $(MKF) $(MFLAGS) clean distclean-std $(distclean-support)
  +	-rm -f $(SRC)/Configuration.apaci
  +	-rm -f $(SRC)/apaci
  +	-rm -f Makefile
  +
   distclean-std:
  -	@$(MAKE) -f $(MKF) $(MFLAGS) clean
  -	-rm -f $(SRC)/support/Makefile
   	-rm -f $(SRC)/main/Makefile
   	-rm -f $(SRC)/ap/Makefile
   	-rm -f $(SRC)/regex/Makefile
  @@ -360,11 +385,11 @@
   	-rm -f $(SRC)/modules/standard/Makefile
   	-rm -f $(SRC)/modules/proxy/Makefile
   	-rm -f $(SRC)/modules/Makefile
  -	-rm -f $(SRC)/Makefile
   	-rm -f $(SRC)/Makefile.config
  -	-rm -f $(SRC)/Configuration.apaci
  -	-rm -f $(SRC)/apaci
  -	-rm -f Makefile
  +	-rm -f $(SRC)/Makefile
  +
  +distclean-support:
  +	-rm -f $(SRC)/support/Makefile
   
   distclean-shadow:
   	rm -rf $(SRC)
  
  
  

Mime
View raw message