httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/include ap_config.h .cvsignore
Date Sat, 10 Feb 2001 11:59:58 GMT
gstein      01/02/10 03:59:58

  Modified:    .        configure.in
               include  ap_config.h .cvsignore
  Log:
  *) clean out some old crap from ap_config.h; other simplifications; don't
     include stuff randomly (let users include them explicitly)
  *) toss ap_config_path.h -- we can put those values into ap_config_auto.h
  
  Revision  Changes    Path
  1.119     +6 -22     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -u -r1.118 -r1.119
  --- configure.in	2001/01/28 07:55:44	1.118
  +++ configure.in	2001/02/10 11:59:58	1.119
  @@ -263,28 +263,12 @@
   rm -f modules.c
   echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
   
  -AC_OUTPUT_COMMANDS([
  -echo '/* Generated by configure */' > ${path_h}.new
  -echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
  -echo "#define SERVER_CONFIG_FILE \"conf/$progname.conf\"" >> ${path_h}.new
  -echo "#define APACHE_MPM_DIR \"$mpmdir\"" >> ${path_h}.new
  -
  -cmp ${path_h}.new ${path_h} >/dev/null 2>&1
  -if test $? -ne 0 ; then
  -    rm -f ${path_h} && mv ${path_h}.new ${path_h} && \
  -    echo "Updated ${path_h}"
  -else
  -    rm -f ${path_h}.new && \
  -    echo "${path_h} unchanged"
  -fi
  -],[
  -path_h=./include/ap_config_path.h
  -prefix=$prefix
  -exec_prefix=$exec_prefix
  -bindir=$bindir
  -progname=$progname
  -mpmdir=$MPM_DIR
  -])
  +AC_DEFINE_UNQUOTED(HTTPD_ROOT, "$prefix",
  +	[Root directory of the Apache install area])
  +AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "conf/$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])
   
   AC_TYPE_RLIM_T
   
  
  
  
  1.55      +14 -27    httpd-2.0/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_config.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -u -r1.54 -r1.55
  --- ap_config.h	2001/01/28 22:50:01	1.54
  +++ ap_config.h	2001/02/10 11:59:58	1.55
  @@ -52,11 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  -#ifndef AP_AC_CONFIG_H
  -#define AP_AC_CONFIG_H
  +#ifndef AP_CONFIG_H
  +#define AP_CONFIG_H
   
  -#include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
  -#include "apr_lib.h"		/* apr_isfoo() macros */
  +#include "apr.h"
   #include "apr_hooks.h"
   
   /**
  @@ -149,10 +148,10 @@
    */
   
   #define AP_DECLARE_HOOK(ret,name,args) \
  -APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args)
  +	APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args)
   
   #define AP_IMPLEMENT_HOOK_BASE(name) \
  -APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name)
  +	APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name)
   
   /**
    * Implement an Apache core hook that has no return code, and
  @@ -169,7 +168,7 @@
    * @deffunc AP_IMPLEMENT_HOOK_VOID(name, args_decl, args_use)
    */
   #define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \
  -APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use)
  +	APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use)
   
   /**
    * Implement an Apache core hook that runs until one of the functions
  @@ -193,7 +192,8 @@
    * @deffunc AP_IMPLEMENT_HOOK_RUN_ALL(ret, name, args_decl, args_use, ok, decline)
    */
   #define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \
  -APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline)
  +	APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \
  +                                            args_use,ok,decline)
   
   /**
    * Implement a hook that runs until the first function that returns
  @@ -214,21 +214,15 @@
    * @deffunc AP_IMPLEMENT_HOOK_RUN_FIRST(ret, name, args_decl, args_use, decline)
    */
   #define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \
  -APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline)
  +	APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl, \
  +                                              args_use,decline)
   
  -#ifdef WIN32
   #include "os.h"
  -#else
  +#ifndef WIN32
   #include "ap_config_auto.h"
  -#include "ap_config_path.h"
  -#include "os.h"
  -#endif /* !WIN32 */
  -#include "apr.h"
  -#ifdef STDC_HEADERS
  -#include <stdlib.h>
  -#include <string.h>
   #endif
   
  +
   #ifdef SIGWAIT_TAKES_ONE_ARG
   #define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
   #else
  @@ -244,13 +238,6 @@
   #define NO_LINGCLOSE
   #endif
   
  -#ifdef SCO5
  -/* This allows Apache to run from a startup script on a SCO box in high
  - * security (C2) mode.  
  - */
  -#define SecureWare
  -#endif
  -
   /* XXX - The PHP4 comments say -D_HPUX_SOURCE is obsolete. */
   
   /* TODO - none of the dynamic linking defines are in yet, but that's because
  @@ -267,7 +254,7 @@
   
   /* If APR has OTHER_CHILD logic, use reliable piped logs.
    */
  -#if (APR_HAS_OTHER_CHILD)
  +#if APR_HAS_OTHER_CHILD
   #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
   #endif
   
  @@ -275,4 +262,4 @@
   #define APACHE_XLATE
   #endif
   
  -#endif /* AP_AC_CONFIG_H */
  +#endif /* AP_CONFIG_H */
  
  
  
  1.4       +2 -3      httpd-2.0/include/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- .cvsignore	2000/03/31 02:38:33	1.3
  +++ .cvsignore	2001/02/10 11:59:58	1.4
  @@ -1,3 +1,2 @@
  -stamp-h*
  -ap_config_auto.h*
  -ap_config_path.h
  +ap_config_auto.h
  +ap_config_auto.h.in
  
  
  

Mime
View raw message