Branch 'Directory_Server_8_2_Branch' - configure m4/httpd.m4

[Nathan Kinder]

 configure   |   14 ++++++++++----
 m4/httpd.m4 |   11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 3fe633f5d1e947a7e1f1bc9b063eb6733548aa80
Author: Nathan Kinder <nkinder(a)redhat.com&gt;
Date:   Thu Feb 11 16:14:54 2010 -0800

    Make check for threaded httpd work with Apache 2.0
    
    The check we use for a threaded httpd doesn't properly detect a
    threaded Apache 2.0.  This adds an additional check to the m4
    file which makes this work.

diff --git a/configure b/configure
index 889f295..03aed62 100755
--- a/configure
+++ b/configure
@@ -23601,13 +23601,19 @@ else
     if test "$httpd_model" = yes ; then
         echo "$as_me:$LINENO: result: good - threading model is supported"
>&5
 echo "${ECHO_T}good - threading model is supported" >&6
-    elif test "$enable_threading" = yes ; then
-        { { echo "$as_me:$LINENO: error: threading model not supported - use
--disable-threading to force use of unthreaded model" >&5
+    else
+        httpd_model=`$HTTPD -V | grep "APACHE_MPM_DIR" | grep
"worker"`
+        if test -n "httpd_model" ; then
+            echo "$as_me:$LINENO: result: good - threading model is supported"
>&5
+echo "${ECHO_T}good - threading model is supported" >&6
+        elif test "$enable_threading" = yes ; then
+            { { echo "$as_me:$LINENO: error: threading model not supported - use
--disable-threading to force use of unthreaded model" >&5
 echo "$as_me: error: threading model not supported - use --disable-threading to
force use of unthreaded model" >&2;}
    { (exit 1); exit 1; }; }
-    else
-        echo "$as_me:$LINENO: result: NOTICE - threading support explicitly disabled
- Admin Server authorization cache will not work correctly" >&5
+        else
+            echo "$as_me:$LINENO: result: NOTICE - threading support explicitly
disabled - Admin Server authorization cache will not work correctly" >&5
 echo "${ECHO_T}NOTICE - threading support explicitly disabled - Admin Server
authorization cache will not work correctly" >&6
+        fi
     fi
 fi
 
diff --git a/m4/httpd.m4 b/m4/httpd.m4
index 03a52a2..6b5b78d 100644
--- a/m4/httpd.m4
+++ b/m4/httpd.m4
@@ -93,10 +93,15 @@ else
     httpd_model=`$HTTPD -V | grep "threaded:" | awk '{print $2}'`
     if test "$httpd_model" = yes ; then
         AC_MSG_RESULT([good - threading model is supported])
-    elif test "$enable_threading" = yes ; then
-        AC_MSG_ERROR([threading model not supported - use --disable-threading to force
use of unthreaded model])
     else
-        AC_MSG_RESULT([NOTICE - threading support explicitly disabled - Admin Server
authorization cache will not work correctly])
+        httpd_model=`$HTTPD -V | grep "APACHE_MPM_DIR" | grep
"worker"`
+        if test -n "httpd_model" ; then
+            AC_MSG_RESULT([good - threading model is supported])
+        elif test "$enable_threading" = yes ; then
+            AC_MSG_ERROR([threading model not supported - use --disable-threading to
force use of unthreaded model])
+        else
+            AC_MSG_RESULT([NOTICE - threading support explicitly disabled - Admin Server
authorization cache will not work correctly])
+        fi
     fi
 fi