httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject cvs commit: httpd-2.0 STATUS acinclude.m4 configure.in
Date Tue, 03 Apr 2001 23:47:40 GMT
marc        01/04/03 16:47:40

  Modified:    .        STATUS acinclude.m4 configure.in
  Log:
  Temporary (hopefully) reversion to the previously used hack to
  allow --prefix to work for now.  This means that part of the Apache
  layout is duplicated in configure.in again.
  
  There are a _LOT_ of inconsistencies in different places about what
  items in config.layout are actually used and how they can be set.
  
  Also, change the couple of other things that are necessary to make
  /usr/local/apache2 the default prefix when using this way of doing
  things.
  
  Revision  Changes    Path
  1.217     +8 -1      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -u -r1.216 -r1.217
  --- STATUS	2001/04/03 22:56:48	1.216
  +++ STATUS	2001/04/03 23:47:39	1.217
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/04/03 22:56:48 $]
  +Last modified at [$Date: 2001/04/03 23:47:39 $]
   
   Release:
   
  @@ -97,6 +97,13 @@
           MsgId: <3A9C0097.9C83F07C@Golux.Com>
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
  +
  +    * the autoconf setup should be fixed to default to using the 
  +      "Apache" layout from config.layout, and each variable settable
  +      in a layout should be overridable on the command line.  Plus,
  +      what we do right now just doesn't seem to fully fit into how autoconf
  +      works, eg. AC_PREFIX_DEFAULT issues.
  +        Message-ID: <Pine.BSF.4.20.0104031557420.20876-100000@alive.znep.com>
   
       * mod_status ExtendedStatus SS (seconds since last request) is
         bogus because of an uninitialized field in the scoreboard.
  
  
  
  1.76      +12 -2     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- acinclude.m4	2001/04/03 17:03:35	1.75
  +++ acinclude.m4	2001/04/03 23:47:39	1.76
  @@ -329,9 +329,19 @@
   ])
   
   if test -z "$LAYOUT"; then
  -  LAYOUT="Apache"
  +  # XXX FIXME: this isn't a complete list of things that have to be set to 
  +  # create the Apache layout in config.layout, and it really should just
  +  # use what is specified in config.layout instead of duping it.
  +  htdocsdir='$(prefix)/htdocs'
  +  iconsdir='$(prefix)/icons'
  +  cgidir='$(prefix)/cgi-bin'
  +  logfiledir='$(prefix)/logs'
  +  sysconfdir='${prefix}/conf'
  +  libexecdir='${prefix}/modules'
  +  layout_name=Apache
  +else 
  +  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
   fi
  -APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
   
   AC_MSG_CHECKING(for chosen layout)
   AC_MSG_RESULT($layout_name)
  
  
  
  1.142     +5 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- configure.in	2001/04/03 20:57:57	1.141
  +++ configure.in	2001/04/03 23:47:39	1.142
  @@ -31,8 +31,12 @@
   dnl
   APR_CONFIG_NICE(config.nice)
   
  +dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
  +dnl by configure until it is too late.  Is that how it should be or not?
  +dnl Something seems broken here.
  +AC_PREFIX_DEFAULT(/usr/local/apache2)
  +test "$prefix" = "NONE" && prefix='/usr/local/apache2'
   test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
  -test "$prefix" = "NONE" && prefix='/usr/local'
   
   dnl Absolute source/build directory
   abs_srcdir=`(cd $srcdir && pwd)`
  
  
  

Mime
View raw message