From: Jeff Trawick <trawick@apache.org>
Date: Thu, 17 Apr 2003 02:41:15 +0000 (+0000)
Subject: Fix a problem that caused httpd to linked with incorrect flags
X-Git-Tag: pre_ajp_proxy~1838
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c145e5d2c08545f4dab7c8db8acef6950c278e2;p=thirdparty%2Fapache%2Fhttpd.git

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

PR:              19012


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

diff --git a/CHANGES b/CHANGES
index 16e580a7640..b655940f1fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix a problem that caused httpd to linked with incorrect flags
+     on some platforms when mod_so was enabled by default, breaking 
+     DSOs on AIX.  PR 19012  [Jeff Trawick]
+
   *) Enable ap_sock_disable_nagle for Windows. This along with the  
      addition of  APR_TCP_NODELAY_INHERITED to apr.hw will cause Nagle 
      to be disabled for Windows.
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 04b73f77382..d4401cdbfa7 100644
--- 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