httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-1.3 configure Makefile.tmpl
Date Mon, 29 Mar 1999 11:40:20 GMT
bjh         99/03/29 03:40:19

  Modified:    .        configure Makefile.tmpl
  Log:
  Top level Makefile generated by ./configure contained a hard coded
  SHELL=/bin/sh which isn't appropriate for OS/2. Make it find sh in the
  PATH if /bin/sh doesn't exist.
  
  Reviewed by:	Ralf S. Engelschall
  
  Revision  Changes    Path
  1.78      +14 -1     apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/configure,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- configure	1999/03/23 16:25:38	1.77
  +++ configure	1999/03/29 11:40:18	1.78
  @@ -178,6 +178,18 @@
   esac
   
   ##
  +##  determine path to sh, it's not /bin/sh on ALL systems
  +##
  +SHELL=/bin/sh
  +if [ ! -f "$SHELL" ]; then
  +    SHELL="`$aux/PrintPath sh`"
  +    if [ "x$SHELL" = "x" ]; then
  +        echo "configure:Error: Cannot determine path to Bourne-Shell" 1>&2
  +        exit 1
  +    fi
  +fi
  +
  +##
   ##  determine default parameters
   ##
   
  @@ -1115,7 +1127,8 @@
   -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"
  +-e "s%@distclean_support@%$distclean_support%g" \
  +-e "s%@SHELL@%$SHELL%g"
   
   ##
   ##  override default paths in $src/include/httpd.h
  
  
  
  1.69      +1 -1      apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- Makefile.tmpl	1999/03/25 19:56:56	1.68
  +++ Makefile.tmpl	1999/03/29 11:40:18	1.69
  @@ -67,7 +67,7 @@
   ## ==================================================================
   
   #   safe environment
  -SHELL           = /bin/sh
  +SHELL           = @SHELL@
   
   #   paths to the source tree parts
   TOP             = .
  
  
  

Mime
View raw message