httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0 configure.in
Date Thu, 28 Feb 2002 02:56:16 GMT
aaron       02/02/27 18:56:15

  Modified:    .        configure.in
  Log:
  No longer assume SERVER_CONFIG_FILE is in the "conf" directory. Instead
  look for it in the $sysconfdir.
  
  This required the use of a new m4 function from APR that retrieves
  the fully "expanded", or recursively interpolated, value of the
  $sysconfdir variable.
  
  Revision  Changes    Path
  1.204     +4 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- configure.in	28 Feb 2002 01:38:11 -0000	1.203
  +++ configure.in	28 Feb 2002 02:56:15 -0000	1.204
  @@ -443,9 +443,11 @@
   rm -f modules.c
   echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
   
  -AC_DEFINE_UNQUOTED(HTTPD_ROOT, "$prefix",
  +APR_EXPAND_VAR(ap_prefix, $prefix)
  +AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
   	[Root directory of the Apache install area])
  -AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "conf/$progname.conf",
  +APR_EXPAND_VAR(ap_sysconfdir, $sysconfdir)
  +AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${ap_sysconfdir}/${progname}.conf",
   	[Location of the config file, relative to the Apache root directory])
   AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
   	[Location of the source for the current MPM])
  
  
  

Mime
View raw message