cvs commit: httpd-2.0 CHANGES configure.in acinclude.m4

[aa...@apache.org]

aaron       02/03/21 11:40:07

  Modified:    .        CHANGES configure.in acinclude.m4
  Log:
  Added exp_foo and rel_foo variables to config_vars.mk for all Apache and
  Autoconf path variables (like --sysconfdir, --sbindir, etc). exp_foo is
  the "expanded" version, which means that all internal variable references
  have been interpolated.  rel_foo is the same as $exp_foo, only relative
  to $prefix if they share a common path.
  
  This will be used in apxs.in and apachectl.in to allow Apache installs
  to be relocated as long as the same relative directory structure remains.
  Currently this is only possible if you use the Apache layout, but not
  with other layouts or any overridden --foodir paths.
  
  Revision  Changes    Path
  1.652     +7 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.651
  retrieving revision 1.652
  diff -u -r1.651 -r1.652
  --- CHANGES	21 Mar 2002 19:12:54 -0000	1.651
  +++ CHANGES	21 Mar 2002 19:40:06 -0000	1.652
  @@ -1,5 +1,12 @@
   Changes with Apache 2.0.34-dev
   
  +  *) Added exp_foo and rel_foo variables to config_vars.mk for
  +     all Apache and Autoconf path variables (like --sysconfdir,
  +     --sbindir, etc). exp_foo is the "expanded" version, which means
  +     that all internal variable references have been interpolated.
  +     rel_foo is the same as $exp_foo, only relative to $prefix if they
  +     share a common path.  [Aaron Bannert]
  +
     *) Fix some restart/terminate problems in the worker MPM.  Don't
        drop connections during graceful restart.  [Jeff Trawick]
   
  
  
  
  1.211     +3 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.210
  retrieving revision 1.211
  diff -u -r1.210 -r1.211
  --- configure.in	16 Mar 2002 06:35:11 -0000	1.210
  +++ configure.in	21 Mar 2002 19:40:06 -0000	1.211
  @@ -29,6 +29,9 @@
   dnl reparse the configure arguments.
   APACHE_PARSE_ARGUMENTS
   
  +dnl export expanded and relative configure argument variables
  +APACHE_EXPORT_ARGUMENTS
  +
   dnl Save user-defined environment settings for later restoration
   dnl
   APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
  @@ -452,8 +455,6 @@
   APR_EXPAND_VAR(ap_prefix, $prefix)
   AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
   	[Root directory of the Apache install area])
  -APR_EXPAND_VAR(ap_sysconfdir, $sysconfdir)
  -APR_PATH_RELATIVE(rel_sysconfdir, $ap_sysconfdir, $prefix)
   AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
   	[Location of the config file, relative to the Apache root directory])
   AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
  
  
  
  1.119     +35 -0     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- acinclude.m4	21 Mar 2002 19:23:39 -0000	1.118
  +++ acinclude.m4	21 Mar 2002 19:40:06 -0000	1.119
  @@ -637,3 +637,38 @@
   done
   
   ])dnl
  +
  +dnl
  +dnl APACHE_EXPORT_ARGUMENTS
  +dnl Export (via APACHE_SUBST) the various path-related variables that
  +dnl apache will use while generating scripts like autoconf and apxs and
  +dnl the default config file.
  +
  +AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
  +  APR_EXPAND_VAR(exp_$1, [$]$1)
  +  APACHE_SUBST(exp_$1)
  +  APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
  +  APACHE_SUBST(rel_$1)
  +])
  +
  +AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
  +  APACHE_SUBST_EXPANDED_ARG(exec_prefix)
  +  APACHE_SUBST_EXPANDED_ARG(bindir)
  +  APACHE_SUBST_EXPANDED_ARG(sbindir)
  +  APACHE_SUBST_EXPANDED_ARG(libexecdir)
  +  APACHE_SUBST_EXPANDED_ARG(mandir)
  +  APACHE_SUBST_EXPANDED_ARG(sysconfdir)
  +  APACHE_SUBST_EXPANDED_ARG(datadir)
  +  APACHE_SUBST_EXPANDED_ARG(installbuilddir)
  +  APACHE_SUBST_EXPANDED_ARG(errordir)
  +  APACHE_SUBST_EXPANDED_ARG(iconsdir)
  +  APACHE_SUBST_EXPANDED_ARG(htdocsdir)
  +  APACHE_SUBST_EXPANDED_ARG(manualdir)
  +  APACHE_SUBST_EXPANDED_ARG(cgidir)
  +  APACHE_SUBST_EXPANDED_ARG(includedir)
  +  APACHE_SUBST_EXPANDED_ARG(localstatedir)
  +  APACHE_SUBST_EXPANDED_ARG(runtimedir)
  +  APACHE_SUBST_EXPANDED_ARG(logfiledir)
  +  APACHE_SUBST_EXPANDED_ARG(proxycachedir)
  +])
  +