From: Greg Stein Date: Sat, 10 Feb 2001 11:59:58 +0000 (+0000) Subject: *) clean out some old crap from ap_config.h; other simplifications; don't X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=037d6351d4e78183c366e04e948dfe487b9e1ce3;p=apache *) 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88057 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/configure.in b/configure.in index fe5ca2b692..221853386b 100644 --- a/configure.in +++ b/configure.in @@ -263,28 +263,12 @@ dnl ## Build modules.c 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 diff --git a/include/.cvsignore b/include/.cvsignore index a81f231525..e46ebcac5d 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -1,3 +1,2 @@ -stamp-h* -ap_config_auto.h* -ap_config_path.h +ap_config_auto.h +ap_config_auto.h.in diff --git a/include/ap_config.h b/include/ap_config.h index add4a48edf..9ef13bd6ca 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -52,11 +52,10 @@ * . */ -#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 @@ APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name) * @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 @@ APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use) * @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 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline * @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 -#include #endif + #ifdef SIGWAIT_TAKES_ONE_ARG #define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0) #else @@ -244,13 +238,6 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) #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 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) /* 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 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) #define APACHE_XLATE #endif -#endif /* AP_AC_CONFIG_H */ +#endif /* AP_CONFIG_H */