cvs commit: apache/src Configure CutRule Makefile.tmpl

[Jim Jagielski <ji...@hyperreal.com>]

jim         96/09/08 09:14:57

  Modified:    src       Configure CutRule Makefile.tmpl
  Log:
  Log: Minor Configure fluff
  Description: Map RULES to lowercase and work with OLD
               shell tests
  
  Revision  Changes    Path
  1.15      +9 -9      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -C3 -r1.14 -r1.15
  *** Configure	1996/09/08 13:52:39	1.14
  --- Configure	1996/09/08 16:14:55	1.15
  ***************
  *** 1,5 ****
    #!/bin/sh
  ! # $Id: Configure,v 1.14 1996/09/08 13:52:39 ben Exp $
    trap 'rm $tmpfile; exit' 0 1 2 3 15
    
    # Apache configuration script, first cut --- rst.
  --- 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.
  ***************
  *** 114,120 ****
    
    PLAT=`grep "PLATFORM=" Makefile | awk '{ print $1 }' | awk -F= '{ print $2 }'`
    
  ! if [ "$PLAT" = "" ]; then
    	echo "PLATFORM has not been set!"
    	exit 1
    fi
  --- 114,120 ----
    
    PLAT=`grep "PLATFORM=" Makefile | awk '{ print $1 }' | awk -F= '{ print $2 }'`
    
  ! if [ "x$PLAT" = "x" ]; then
    	echo "PLATFORM has not been set!"
    	exit 1
    fi
  ***************
  *** 206,212 ****
    	OS='SCO 5'
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! 	OSBPRINTF=" -K noinline"
    	DEF_HSREGEX=no
    	DEF_BADMMAP=no
    	;;
  --- 206,212 ----
    	OS='SCO 5'
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! 	OSBPRINTF="-K noinline"
    	DEF_HSREGEX=no
    	DEF_BADMMAP=no
    	;;
  ***************
  *** 245,257 ****
    
    # 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 [ "$DEF_HSREGEX" = "" ]; then
    		RULE_HSREGEX=no
    	else
    		RULE_HSREGEX=$DEF_HSREGEX
  --- 245,257 ----
    
    # 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
  ***************
  *** 259,265 ****
    fi
    
    if [ "$RULE_BADMMAP" = "default" ]; then
  ! 	if [ "$DEF_BADMMAP" = "" ]; then
    		RULE_BADMMAP=no
    	else
    		RULE_BADMMAP=$DEF_BADMMAP
  --- 259,265 ----
    fi
    
    if [ "$RULE_BADMMAP" = "default" ]; then
  ! 	if [ "x$DEF_BADMMAP" = "x" ]; then
    		RULE_BADMMAP=no
    	else
    		RULE_BADMMAP=$DEF_BADMMAP
  
  
  
  1.2       +3 -1      apache/src/CutRule
  
  Index: CutRule
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CutRule,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** CutRule	1996/09/08 13:52:40	1.1
  --- CutRule	1996/09/08 16:14:55	1.2
  ***************
  *** 1,4 ****
    # Helper script for Configure - cut a rule from Configuration.
    # note that there is a tab and a space in the character groups.
    
  ! egrep "Rule[	 ]+$1[	 ]*=" Configuration|cut -d= -f2|sed 's/[	 ]//g'
  --- 1,6 ----
    # Helper script for Configure - cut a rule from Configuration.
    # note that there is a tab and a space in the character groups.
  + # Map to lowercase to make tests easier
    
  ! egrep "Rule[	 ]+$1[	 ]*=" Configuration|cut -d= -f2|sed 's/[	 ]//g'\
  !  | tr "A-Z" "a-z"
  
  
  
  1.25      +2 -2      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -C3 -r1.24 -r1.25
  *** Makefile.tmpl	1996/09/08 12:19:09	1.24
  --- Makefile.tmpl	1996/09/08 16:14:55	1.25
  ***************
  *** 1,4 ****
  ! # $Id: Makefile.tmpl,v 1.24 1996/09/08 12:19:09 ben Exp $
    # Apache makefile template (well, suffix).
    
    # This is combined with the information in the "Configuration" file
  --- 1,4 ----
  ! # $Id: Makefile.tmpl,v 1.25 1996/09/08 16:14:55 jim Exp $
    # Apache makefile template (well, suffix).
    
    # This is combined with the information in the "Configuration" file
  ***************
  *** 14,20 ****
      md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
    
    .c.o:
  ! 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
    
    all: Configuration httpd
    
  --- 14,20 ----
      md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
    
    .c.o:
  ! 	$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
    
    all: Configuration httpd