merge this from 2.1-dev:

  Fix a problem that caused httpd to be linked with incorrect flags
  on some platforms when mod_so was enabled by default, breaking
  DSOs on AIX.

PR:                 19012
Reviewed by:	    nd, stoddard

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

diff --git a/CHANGES b/CHANGES
index b47bb3b8eb853fe9d3f7c8257799a0c633f81272..672c4ad382712e613fc0e20c0fcce331cc648013 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.46
 
+  *) Fix a problem that caused httpd to be linked with incorrect flags
+     on some platforms when mod_so was enabled by default, breaking 
+     DSOs on AIX.  PR 19012  [Jeff Trawick]
+
   *) By default, use the same CC and CPP with which APR was built.
      The user can override with CC and CPP environment variables.
      [Jeff Trawick]

diff --git a/STATUS b/STATUS
index 37d7b734bdefe089682910a56f115fb14a7519bb..50803e21fd767f088ae14170bcd12f6b6c2f0724 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/05/13 16:35:33 $]
+Last modified at [$Date: 2003/05/13 16:53:05 $]
 
 Release:
 
@@ -203,15 +203,6 @@ PATCHES TO PORT FROM 2.1
       (the docs should explain the thing better. Currently it's not
        really understandable for users. If nobody else does, nd tries to.)
 
-    * Fix a problem that caused httpd to be linked with incorrect flags
-      on some platforms when mod_so was enabled by default, breaking 
-      DSOs on AIX.  PR 19012
-      This was new breakage with 2.0.45 that has bit at least a 
-      handful of vocal people, but there is an easy work-around 
-      (explicitly add --enable-so).
-      modules/mappers/config9.m4 r1.16
-      +1: trawick, nd, stoddard
-
     * Hook mod_rewrite's type checker before mod_mime's one. That way the
       RewriteRule [T=...] Flag should work as expected now. PR 19626.
       modules/mappers/mod_rewrite.c r1.150

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 04b73f77382dabeaaedd89191ac03327eb144e65..d4401cdbfa7f72b21fe759b1aec7c09d2d0e180d 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -15,25 +15,34 @@ APACHE_MODULE(alias, translation of requests, , , yes)
 
 APACHE_MODULE(rewrite, regex URL translation, , , most)
 
-dnl mod_so should only be built as a static module
-if test "$enable_so" = "yes"; then
-    enable_so="static"
-elif test "$enable_so" = "shared"; then
-    AC_MSG_ERROR([mod_so can not be built as a shared DSO])
-fi
 
 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
+
+case "x$enable_so" in
+    "xyes")
+        if test $ac_cv_define_APR_HAS_DSO = "no"; then
+            AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
+        fi
+        ;;
+    "xshared")
+        AC_MSG_ERROR([mod_so can not be built as a shared DSO])
+        ;;
+    "xno")
+        ;;
+    "x")
+        enable_so=$ac_cv_define_APR_HAS_DSO
+        ;;
+esac
+
+if test "$sharedobjs" = "yes"; then
+    if test $ac_cv_define_APR_HAS_DSO = "no"; then
         AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
-    else
-        ap_enable_so="no"
+    elif test $enable_so = "no"; then
+        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so was disabled])
     fi
 fi
 
-APACHE_MODULE(so, DSO capability, , , $ap_enable_so)
+APACHE_MODULE(so, DSO capability, , , $enable_so)
 
 dnl ### why save the cache?
 AC_CACHE_SAVE