commit some missing bits from wrowe's merge of the out-of-tree-APR

feature

(modules/aaa/config.m4 was absolutely required; it probably
would have worked without this modules/mappers/config9.m4 change)

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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 525e79d675adf8190ee598f5ea5846f923b91374..4440f67e86364a4cd4c6e8ef952c68a876d6ba62 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -10,14 +10,12 @@ APACHE_MODULE(auth_anon, anonymous user access, , , most)
 APACHE_MODULE(auth_dbm, DBM-based access databases, , , most)
 
 APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
-  ap_old_cppflags=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
-  AC_TRY_COMPILE([#include <apr.h>], 
-                 [#if !APR_HAS_RANDOM 
-                  #error You need APR random support to use auth_digest. 
-                  #endif],,
-                 enable_auth_digest=no)
-  CPPFLAGS=$ap_old_cppflags
+  APR_CHECK_APR_DEFINE(APR_HAS_RANDOM)
+  if test $ac_cv_define_APR_HAS_RANDOM = "no"; then
+    echo "You need APR random support to use mod_auth_digest."
+    echo "Look at APR configure options --with-egd and --with-devrandom."
+    enable_auth_digest="no"
+  fi
 ])
 
 APR_ADDTO(LT_LDFLAGS,-export-dynamic)

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 5b8a6587a3f7233016fef57dd64bf7bdf7d84704..0d77ab10d2b187fdaf9493bdd60b9d4e117e8c92 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -22,23 +22,16 @@ elif test "$enable_so" = "shared"; then
     AC_MSG_ERROR([mod_so can not be built as a shared DSO])
 fi
 
-ap_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-AC_TRY_COMPILE([#include <apr.h>], [
-#if !APR_HAS_DSO
-#error You need APR DSO support to use mod_so. 
-#endif
-], ap_enable_so="static", [
-if test "$enable_so" = "static"; then
-    AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
-else if test "$sharedobjs" = "yes"; then
-    AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
-else
-    ap_enable_so="no"
+APR_CHECK_APR_DEFINE(APR_HAS_DSO)
+if test $ac_cv_define_APR_HAS_DSO = "no"; then
+    if test "$enable_so" = "static"; then
+        AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
+    elif test "$sharedobjs" = "yes"; then
+        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
+    else
+        ap_enable_so="no"
+    fi
 fi
-fi
-])
-CPPFLAGS=$ap_old_cppflags
 
 APACHE_MODULE(so, DSO capability, , , $ap_enable_so)