httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@locus.apache.org
Subject cvs commit: apache-2.0/src CHANGES Makefile.in acinclude.m4 configure.in
Date Fri, 11 Aug 2000 04:13:46 GMT
coar        00/08/10 21:13:44

  Modified:    src      CHANGES Makefile.in acinclude.m4 configure.in
  Log:
  	Add recognition of the --with-port=n (as was added to 1.3), and
  	raise an error if --enable-layout is specified but we can't
  	find the definition file.
  
  Revision  Changes    Path
  1.198     +5 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -u -r1.197 -r1.198
  --- CHANGES	2000/08/10 11:22:54	1.197
  +++ CHANGES	2000/08/11 04:13:42	1.198
  @@ -1,4 +1,9 @@
   Changes with Apache 2.0a6
  +  *) Abort configuration if --with-layout was specified and there's
  +     no layout definition file.  [Ken Coar]
  +
  +  *) Add support for '--with-port=n' option to configure.  [Ken Coar]
  +
     *) Add support for extension methods for the Allow response header
        field, and an API routine for accessing r->allowed and the
        list of extension methods in a unified manner.  [Ken Coar]
  
  
  
  1.27      +1 -0      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -u -r1.26 -r1.27
  --- Makefile.in	2000/07/28 16:22:32	1.26
  +++ Makefile.in	2000/08/11 04:13:43	1.27
  @@ -33,6 +33,7 @@
   	done; \
   	for i in *-dist; do \
   		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
  +		    -e 's#@@Port@@#$(PORT)#g' \
   			< $$i > $(sysconfdir)/$$i; \
   		chmod 0644 $(sysconfdir)/$$i; \
   		file=`echo $$i|sed s/-dist//`; \
  
  
  
  1.44      +6 -0      apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -u -r1.43 -r1.44
  --- acinclude.m4	2000/07/25 20:08:12	1.43
  +++ acinclude.m4	2000/08/11 04:13:43	1.44
  @@ -75,6 +75,7 @@
     APACHE_SUBST(LIBTOOL)
     APACHE_SUBST(SHELL)
     APACHE_SUBST(MODULE_DIRS)
  +  APACHE_SUBST(PORT)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  @@ -324,6 +325,11 @@
   dnl
   dnl APACHE_LAYOUT(configlayout, layoutname)
   AC_DEFUN(APACHE_LAYOUT,[
  +  if test ! -f $srcdir/../config.layout; then
  +    echo "** Error: Layout file $srcdir/../config.layout not found"
  +    echo "** Error: Cannot use undefined layout '$LAYOUT'"
  +    exit 1
  +  fi
     pldconf=config.pld
     changequote({,})
     sed -e "1,/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*/d" \
  
  
  
  1.74      +4 -0      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -u -r1.73 -r1.74
  --- configure.in	2000/07/23 12:32:17	1.73
  +++ configure.in	2000/08/11 04:13:43	1.74
  @@ -107,6 +107,10 @@
   AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
           [OPTIM="$withval"])
   
  +AC_ARG_WITH(port,[  --with-port=PORT        Port on which to listen (default is 80)],
  +        [PORT="$withval"],
  +	[PORT=80])
  +
   AC_ARG_WITH(debug,[  --with-debug            Turn on debugging and compile time warnings],
           [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g";
fi])
   
  
  
  

Mime
View raw message