Use AP_ instead of APR_ and move into the compile CPP

flags

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101077 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 9a565550b0e038c7b664196b33798d9ad07cb42a..bdc5f51f5d2369d0ebc0d8337cd53c8569619170 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)
 ])dnl
 
 AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception hook),

diff --git a/include/ap_hooks.h b/include/ap_hooks.h
index f3ab51a93393025dc10061d77617b91dc597b9c2..60cda73e3a94310504ac002a13e933dd5a6ad9b2 100644 (file)
--- a/include/ap_hooks.h
+++ b/include/ap_hooks.h
@@ -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