From: Jim Jagielski <jim@apache.org>
Date: Mon, 9 May 2011 15:58:10 +0000 (+0000)
Subject: Use AP_ instead of APR_ and move into the compile CPP
X-Git-Tag: 2.3.12~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ee5ab0f04a0295a24ecd0d6e4fcef71ea234326;p=thirdparty%2Fapache%2Fhttpd.git

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 9a565550b0e..bdc5f51f5d2 100644
--- 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 f3ab51a9339..60cda73e3a9 100644
--- 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