You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jeff Trawick <tr...@gmail.com> on 2011/05/09 18:05:57 UTC
Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
On Mon, May 9, 2011 at 11:58 AM, <ji...@apache.org> wrote:
> Author: jim
> Date: Mon May 9 15:58:10 2011
> New Revision: 1101077
>
> URL: http://svn.apache.org/viewvc?rev=1101077&view=rev
> Log:
> Use AP_ instead of APR_ and move into the compile CPP
> flags
>
> Modified:
> httpd/httpd/trunk/configure.in
> httpd/httpd/trunk/include/ap_hooks.h
>
> Modified: httpd/httpd/trunk/configure.in
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1101077&r1=1101076&r2=1101077&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/configure.in (original)
> +++ httpd/httpd/trunk/configure.in Mon May 9 15:58:10 2011
> @@ -512,8 +512,9 @@ APACHE_SUBST(DTRACE)
>
> AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hook probes),
> [
> - AC_DEFINE(APR_HOOK_PROBES_ENABLED, 1,
> + AC_DEFINE(AP_HOOK_PROBES_ENABLED, 1,
> [Enable the APR hook probes capability, reading from ap_hook_probes.h])
> + APR_ADDTO(CPPFLAGS, -DAP_HOOK_PROBES_ENABLED)
What is your thought on putting this in some private CPPFLAGS so that
third-party modules which create their own hooks aren't affected by
default?
> ])dnl
>
> AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception hook),
>
> Modified: httpd/httpd/trunk/include/ap_hooks.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_hooks.h?rev=1101077&r1=1101076&r2=1101077&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/ap_hooks.h (original)
> +++ httpd/httpd/trunk/include/ap_hooks.h Mon May 9 15:58:10 2011
> @@ -28,6 +28,10 @@
> * @ingroup APACHE_CORE
> */
>
> +#if defined(AP_HOOK_PROBES_ENABLED) && !defined(APR_HOOK_PROBES_ENABLED)
> +#define APR_HOOK_PROBES_ENABLED 1
> +#endif
> +
> #ifdef APR_HOOK_PROBES_ENABLED
> #include "ap_hook_probes.h"
> #endif
>
>
>
--
Born in Roswell... married an alien...
T&R of 2.3.12... Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
Posted by Jim Jagielski <ji...@jaguNET.com>.
I'm hoping to T&R tomorrow...
On May 9, 2011, at 1:15 PM, Jeff Trawick wrote:
>>
>> Sounds good... I was planning on doing a T&R of 2.3.12 this week;
>> OK if we go with what's currently in place?
>
> I wouldn't call it a showstopper.
>
> When are you planning to T&R?
>
Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, May 9, 2011 at 1:03 PM, Jim Jagielski <ji...@jagunet.com> wrote:
>
> On May 9, 2011, at 12:53 PM, Jeff Trawick wrote:
>
>> On Mon, May 9, 2011 at 12:11 PM, Jim Jagielski <ji...@jagunet.com> wrote:
>>>
>>> On May 9, 2011, at 12:05 PM, Jeff Trawick wrote:
>>>>
>>>> What is your thought on putting this in some private CPPFLAGS so that
>>>> third-party modules which create their own hooks aren't affected by
>>>> default?
>>>>
>>>
>>> Makes sense...
>>
>> maybe I can do that today
>>
>> something like INTERNAL_CPPFLAGS is also needed for MinGW builds
>>
>
> Sounds good... I was planning on doing a T&R of 2.3.12 this week;
> OK if we go with what's currently in place?
I wouldn't call it a showstopper.
When are you planning to T&R?
Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
Posted by Jim Jagielski <ji...@jaguNET.com>.
On May 9, 2011, at 12:53 PM, Jeff Trawick wrote:
> On Mon, May 9, 2011 at 12:11 PM, Jim Jagielski <ji...@jagunet.com> wrote:
>>
>> On May 9, 2011, at 12:05 PM, Jeff Trawick wrote:
>>>
>>> What is your thought on putting this in some private CPPFLAGS so that
>>> third-party modules which create their own hooks aren't affected by
>>> default?
>>>
>>
>> Makes sense...
>
> maybe I can do that today
>
> something like INTERNAL_CPPFLAGS is also needed for MinGW builds
>
Sounds good... I was planning on doing a T&R of 2.3.12 this week;
OK if we go with what's currently in place?
Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, May 9, 2011 at 12:11 PM, Jim Jagielski <ji...@jagunet.com> wrote:
>
> On May 9, 2011, at 12:05 PM, Jeff Trawick wrote:
>>
>> What is your thought on putting this in some private CPPFLAGS so that
>> third-party modules which create their own hooks aren't affected by
>> default?
>>
>
> Makes sense...
maybe I can do that today
something like INTERNAL_CPPFLAGS is also needed for MinGW builds
Re: svn commit: r1101077 - in /httpd/httpd/trunk: configure.in include/ap_hooks.h
Posted by Jim Jagielski <ji...@jaguNET.com>.
On May 9, 2011, at 12:05 PM, Jeff Trawick wrote:
>
> What is your thought on putting this in some private CPPFLAGS so that
> third-party modules which create their own hooks aren't affected by
> default?
>
Makes sense...