Update APR macro usage to new name-protected names.

Replace REENTRANCY_FLAGS with direct use of THREAD_CPPFLAGS.
This is a temporary band-aid, since the way we currently set
the standard make vars (CFLAGS, CPPFLAGS, LDFLAGS, etc.) is
bogus and frequently redundant [to be fixed later].

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

diff --git a/configure.in b/configure.in
index 00403cae933d443cb7ff7a5a47798886b38f3fc9..1c914b647ac383fb213e482f669ea5096bc7e5af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,15 @@ AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)
 dnl AC_PATH_PROG(PERL_PATH, perl)
 
-REENTRANCY_FLAGS
+#
+# Play with CPPFLAGS given what was learned from APR_PRELOAD.
+#
+# XXX: APR only sets this if threads are enabled.  Either APR should be
+# fixed to always set it (most likely), or we should test for threads.
+#
+if test -n "$THREAD_CPPFLAGS"; then
+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+fi
 
 dnl various OS checks that apparently set required flags
 AC_AIX
@@ -243,9 +251,9 @@ dnl ## or disable threads), while still allowing APR to run and generate
 dnl ## APRVARS before Apache generates it's Makefiles and the related files.
 dnl ## This allows APR to detect libraries like dl and tell Apache that it
 dnl ## needs to include or not include them.
-RUN_SUBDIR_CONFIG_NOW(srclib/apr, "$apache_apr_flags --disable-shared")
-RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr --disable-shared")
-RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared")
+APR_SUBDIR_CONFIG(srclib/pcre)
 . ./srclib/apr/APRVARS
 
 dnl get the exported vars from APRUTIL

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 1702e4b53afa275d2c36c300ad343a8f2f7f0822..dbf12a44bf7b23ead6f065700d3768cdd5a2906c 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -13,7 +13,7 @@ AC_MSG_RESULT($APACHE_MPM)
 apache_cv_mpm=$APACHE_MPM
        
 if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then
-  PTHREADS_CHECK
+  APR_PTHREADS_CHECK
   AC_MSG_CHECKING([for which threading library to use])
   AC_MSG_RESULT($threads_result)