From 6a9c4d69025da6d4a499258bc4dcf54b8fb5c648 Mon Sep 17 00:00:00 2001
From: Aaron Bannert <aaron@apache.org>
Date: Wed, 24 Oct 2001 17:20:44 +0000
Subject: [PATCH] Two more mod_so configure-time fixes:  - Treat
 --enable-so=yes as "static" (this includes --enable-so, etc).  - An explicit
 --enable-so=shared issues an error.

Put in a note about the last condition that I'm not as sure how to fix:
If the user doesn't explicitly request mod_so, but instead gives a
mass-enable parameter like --enable-modules=most or
--enable-mods-shared=most then it is still possible to enable a bunch
of modules while mod_so itself is not buildable (ie no APR_HAS_DSO or
other build dependency failure).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91658 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                    | 5 +++++
 STATUS                     | 8 +++++++-
 modules/mappers/config9.m4 | 9 ++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 97a4716608..4329f6580c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.27-dev
 
+  *) Various --enable-so options have been fixed: --enable-so is
+     treated as "static"; explicit --enable-so=shared issues an error;
+     and explicit --enable-so fails with error on systems without
+     APR_HAS_DSO.  [Aaron Bannert]
+
   *) Fix a segfault in the core input filter when the client socket
      gets disconnected unexpectedly.  [Cliff Woolley]
 
diff --git a/STATUS b/STATUS
index 739d20ac5a..73e342eaa4 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:						-*-text-*-
-Last modified at [$Date: 2001/10/22 12:46:29 $]
+Last modified at [$Date: 2001/10/24 17:20:44 $]
 
 Release:
 
@@ -284,6 +284,12 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
         - Bring the Win9xConHook.dll from 1.3 into 2.0 (no sense till it
         actually works) and add in a splash of Win9x service code.
 
+    * When --enable-modules=most or --enable-mods-shared=most is passed
+      to the configure script it is still possible to enable many of the
+      modules while mod_so itself is not buildable (for whatever reason,
+      like not having APR_HAS_DSO). We need to emit an error message
+      and fail the configure script at this point.
+
 PRs that have been suspended forever waiting for someone to
 put them into 'the next release':
 
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index cfd3b61fb4..4d56599119 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -17,6 +17,13 @@ APACHE_MODULE(rewrite, regex URL translation, , , most, [
   APR_ADDTO(CFLAGS,-DNO_DBM_REWRITEMAP)
 ])
 
+dnl mod_so should only be built as a static DSO
+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
+
 ap_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
 AC_TRY_COMPILE([#include <apr.h>], [
@@ -24,7 +31,7 @@ AC_TRY_COMPILE([#include <apr.h>], [
 #error You need APR DSO support to use mod_so. 
 #endif
 ], ap_enable_so="static", [
-if test "$enable_so" = "yes" -o "$enable_so" = "static" -o "$enable_so" = "shared"; then
+if test "$enable_so" = "static"; then
     AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
 else
     ap_enable_so="no"
-- 
2.40.0