httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src Configuration.tmpl Configure
Date Sun, 08 Sep 1996 17:18:47 GMT
jim         96/09/08 10:18:46

  Modified:    src       Configuration.tmpl Configure
  Log:
  Add Rule Defaults for A/UX andchange HSREGEX to WANTHSREGEX to make it more clear what theRule
actually means
  
  Revision  Changes    Path
  1.35      +11 -9     apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -C3 -r1.34 -r1.35
  *** Configuration.tmpl	1996/09/08 13:55:08	1.34
  --- Configuration.tmpl	1996/09/08 17:18:43	1.35
  ***************
  *** 1,4 ****
  ! # $Id: Configuration.tmpl,v 1.34 1996/09/08 13:55:08 ben Exp $
    # Config file for the Apache httpd.
    
    # Configuration.tmpl is the template for Configuration. Configuration should
  --- 1,4 ----
  ! # $Id: Configuration.tmpl,v 1.35 1996/09/08 17:18:43 jim Exp $
    # Config file for the Apache httpd.
    
    # Configuration.tmpl is the template for Configuration. Configuration should
  ***************
  *** 55,73 ****
    # These are used to let Configure know that we want certain
    # functions. The format is: Rule RULE=value
    #
  ! # At present, only the following RULES are known: REGEX, SOCKS, STATUS
  ! # and BADMMAP.
    #
    # For all Rules, if set to "yes", then Configure knows we want that
  ! # capability and does what is required to add it in. If set to anything
  ! # else, or not present, then nothing is done.
    #
  ! # HSREGEX:
    #  Apache requires a POSIX regex implementation. Harry Spencer's
    #  excellent regex package is included with Apache and can be used
    #  if desired. If your OS has a decent regex, you can elect to
  ! #  not use this one by setting HSREGEX to 'no' or commenting
  ! #  out the Rule
    #
    # SOCKS:
    #  If SOCKS is set to 'yes', be sure that you add the sock library
  --- 55,75 ----
    # These are used to let Configure know that we want certain
    # functions. The format is: Rule RULE=value
    #
  ! # At present, only the following RULES are known: WANTHSREGEX, SOCKS,
  ! # STATUS and BADMMAP.
    #
    # For all Rules, if set to "yes", then Configure knows we want that
  ! # capability and does what is required to add it in. If set to "default"
  ! # then Configure makes a "best guess"; if set to anything else, or not
  ! # present, then nothing is done.
    #
  ! # WANTHSREGEX:
    #  Apache requires a POSIX regex implementation. Harry Spencer's
    #  excellent regex package is included with Apache and can be used
    #  if desired. If your OS has a decent regex, you can elect to
  ! #  not use this one by setting WANTHSREGEX to 'no' or commenting
  ! #  out the Rule. The "default" action is "no" unless overruled
  ! #  by OS specifics
    #
    # SOCKS:
    #  If SOCKS is set to 'yes', be sure that you add the sock library
  ***************
  *** 94,100 ****
    # If you have to do this, please let us know what you set and what your
    # platform is, by sending mail to apache-bugs@apache.org.
    
  ! Rule HSREGEX=default
    Rule BADMMAP=default
    
    ###############
  --- 96,102 ----
    # If you have to do this, please let us know what you set and what your
    # platform is, by sending mail to apache-bugs@apache.org.
    
  ! Rule WANTHSREGEX=default
    Rule BADMMAP=default
    
    ###############
  
  
  
  1.16      +13 -11    apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -C3 -r1.15 -r1.16
  *** Configure	1996/09/08 16:14:55	1.15
  --- Configure	1996/09/08 17:18:45	1.16
  ***************
  *** 1,5 ****
    #!/bin/sh
  ! # $Id: Configure,v 1.15 1996/09/08 16:14:55 jim Exp $
    trap 'rm $tmpfile; exit' 0 1 2 3 15
    
    # Apache configuration script, first cut --- rst.
  --- 1,5 ----
    #!/bin/sh
  ! # $Id: Configure,v 1.16 1996/09/08 17:18:45 jim Exp $
    trap 'rm $tmpfile; exit' 0 1 2 3 15
    
    # Apache configuration script, first cut --- rst.
  ***************
  *** 105,112 ****
    # options) as required. Setting CC and OPTIM here has no effect
    # if they were set in Configure.
    #
  ! # Also, we set DEF_HSREGEX and DEF_BADMMAP to the appropriate value for each
  ! # platform.
    #
    # As more PLATFORMs are added to Configuration.tmpl, be sure to
    # add the required lines below.
  --- 105,112 ----
    # options) as required. Setting CC and OPTIM here has no effect
    # if they were set in Configure.
    #
  ! # Also, we set DEF_WANTHSREGEX and DEF_BADMMAP to the appropriate
  ! # value for each platform.
    #
    # As more PLATFORMs are added to Configuration.tmpl, be sure to
    # add the required lines below.
  ***************
  *** 125,130 ****
  --- 125,132 ----
    	CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
    	LIBS="$LIBS -lposix -lbsd"
    	LFLAGS="$LFLAGS -s"
  + 	DEF_WANTHSREGEX=no
  + 	DEF_BADMMAP=no
    	;;
        AIX)
    	OS='IBM AIX'
  ***************
  *** 207,213 ****
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
    	OSBPRINTF="-K noinline"
  ! 	DEF_HSREGEX=no
    	DEF_BADMMAP=no
    	;;
        SOLARIS2)
  --- 209,215 ----
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
    	OSBPRINTF="-K noinline"
  ! 	DEF_WANTHSREGEX=no
    	DEF_BADMMAP=no
    	;;
        SOLARIS2)
  ***************
  *** 245,260 ****
    
    # Extract the rules
    
  ! RULE_HSREGEX=`./CutRule HSREGEX`
    RULE_STATUS=`./CutRule STATUS`
    RULE_SOCKS=`./CutRule SOCKS`
    RULE_BADMMAP=`./CutRule BADMMAP`
    
  ! if [ "$RULE_HSREGEX" = "default" ]; then
  ! 	if [ "x$DEF_HSREGEX" = "x" ]; then
  ! 		RULE_HSREGEX=no
    	else
  ! 		RULE_HSREGEX=$DEF_HSREGEX
    	fi
    fi
    
  --- 247,262 ----
    
    # Extract the rules
    
  ! RULE_WANTHSREGEX=`./CutRule WANTHSREGEX`
    RULE_STATUS=`./CutRule STATUS`
    RULE_SOCKS=`./CutRule SOCKS`
    RULE_BADMMAP=`./CutRule BADMMAP`
    
  ! if [ "$RULE_WANTHSREGEX" = "default" ]; then
  ! 	if [ "x$DEF_WANTHSREGEX" = "x" ]; then
  ! 		RULE_WANTHSREGEX=no
    	else
  ! 		RULE_WANTHSREGEX=$DEF_WANTHSREGEX
    	fi
    fi
    
  ***************
  *** 270,276 ****
    
    echo "# Platform: $OS" >> Makefile
    echo "# Final Rules:" >> Makefile
  ! echo "# Rule HSREGEX=$RULE_HSREGEX" >> Makefile
    echo "# Rule BADMMAP=$RULE_BADMMAP" >> Makefile
    echo "###############" >> Makefile
    
  --- 272,278 ----
    
    echo "# Platform: $OS" >> Makefile
    echo "# Final Rules:" >> Makefile
  ! echo "# Rule WANTHSREGEX=$RULE_WANTHSREGEX" >> Makefile
    echo "# Rule BADMMAP=$RULE_BADMMAP" >> Makefile
    echo "###############" >> Makefile
    
  ***************
  *** 316,322 ****
    #
    # Now HS's POSIX regex implementation if needed/wanted
    #
  ! if [ "$RULE_HSREGEX" = "yes" ]; then
        REGLIB="regex/libregex.a"
        INCLUDES="$INCLUDES -Iregex"
    fi
  --- 318,324 ----
    #
    # Now HS's POSIX regex implementation if needed/wanted
    #
  ! if [ "$RULE_WANTHSREGEX" = "yes" ]; then
        REGLIB="regex/libregex.a"
        INCLUDES="$INCLUDES -Iregex"
    fi
  
  
  

Mime
View raw message