You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/11/02 19:51:10 UTC
cvs commit: apache-2.0/src/main http_main.c
rbb 00/11/02 10:51:10
Modified: src configure.in
src/include http_main.h
src/main http_main.c
Log:
Create a feature macro that determines if Autoconf was used to configure
the server. The ap_ugly_hack variable is only valid if Autoconf was used
for the configuration.
Revision Changes Path
1.84 +3 -1 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- configure.in 2000/11/02 03:30:23 1.83
+++ configure.in 2000/11/02 18:51:02 1.84
@@ -184,6 +184,9 @@
APACHE_SUBST(AP_LIB_DIRS)
APACHE_SUBST(AP_LIBS)
+AC_DEFINE(AP_USING_AUTOCONF, 1,
+ [Using autoconf to configure Apache])
+
dnl check for endianness
if test "$cross_compiling" = "no"; then
AC_C_BIGENDIAN
@@ -255,5 +258,4 @@
AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl,,[
APACHE_GEN_MAKEFILES
])
-
1.16 +1 -1 apache-2.0/src/include/http_main.h
Index: http_main.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- http_main.h 2000/11/02 04:44:43 1.15
+++ http_main.h 2000/11/02 18:51:06 1.16
@@ -89,7 +89,7 @@
* effect the server based on command line options */
extern AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
-#ifndef WIN32 /* A -feature- (?) macro is needed here */
+#ifdef AP_USING_AUTOCONF
extern void *ap_ugly_hack;
#endif
1.69 +1 -1 apache-2.0/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- http_main.c 2000/11/02 04:44:43 1.68
+++ http_main.c 2000/11/02 18:51:08 1.69
@@ -294,7 +294,7 @@
apr_initialize();
-#ifndef WIN32 /* A -feature- (?) macro is needed here */
+#ifdef AP_USING_AUTOCONF
/* This ugly little hack pulls any function referenced in exports.c into
* the web server. exports.c is generated by buildconf, and it
* has all of the apr functions specified by httpd.exp.
Re: cvs commit: apache-2.0/src/main http_main.c
Posted by rb...@covalent.net.
> Why are we going the full route with configure.in? Why isn't this just a
> constant in one of the headers that autoconf generates? (and non-autoconf
> systems like Windows just codes it differently)
I don't know of any such files. The only file that it looks like autoconf
generates is ap_config_auto.h. The problem is that I don't know how to
just add static things to this file. This was part of Manoj's original
design, he wanted to make a very clean distinction between what autoconf
generates and what is manually edited.
If you know how to add a static #define to an autoconf generated file,
please feel free to make the change.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apache-2.0/src/main http_main.c
Posted by Greg Stein <gs...@lyra.org>.
On Thu, Nov 02, 2000 at 06:51:10PM -0000, rbb@locus.apache.org wrote:
> rbb 00/11/02 10:51:10
>
> Modified: src configure.in
> src/include http_main.h
> src/main http_main.c
> Log:
> Create a feature macro that determines if Autoconf was used to configure
> the server. The ap_ugly_hack variable is only valid if Autoconf was used
> for the configuration.
Why are we going the full route with configure.in? Why isn't this just a
constant in one of the headers that autoconf generates? (and non-autoconf
systems like Windows just codes it differently)
The hack is bad enough, but to propagate it all the way out to configure.in
seems even worse.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/