Fix mod_so handling. Basically, if --enable-so or

--enable-some-module=shared is specified on the ./configure line, then
mod_so is included in the build, -ldl is added to LIBS, and --enable-dso is
added to APR's configure line.  Otherwise, mod_so is turned off, -ldl is
not added, and APR is specifically told to build without DSO support.

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

diff --git a/acinclude.m4 b/acinclude.m4
index de43855fb14ac72ec6293f225c32fdb215f96eb9..4f3ac37f365f05e9d191f2b12c50de363fe893b2 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -316,6 +316,10 @@ AC_DEFUN(APACHE_MODULE,[
       shared=yes;;
     *)
       MODLIST="$MODLIST ifelse($4,,$1,$4)"
+      if test "$1" == "so"; then
+          echo "so"
+          sharedobjs=yes
+      fi
       shared="";;
     esac
     ifelse($6,,:,$6)

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 858f394e113c4d97b8ed0c59489ab57c204cb34c..627b2cfe924977737dd2c68b06a216e627408acd 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -54,7 +54,6 @@ APACHE_CHECK_STANDARD_MODULE(unique_id, per-request unique ids, , no)
 APACHE_CHECK_STANDARD_MODULE(setenvif, basing ENV vars on headers, , yes)
 APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , yes)
 
-APACHE_MODPATH_FINISH
 
 ac_cv_enable_dso="no"
 if test "$sharedobjs" = "yes"; then
@@ -64,7 +63,14 @@ if test "$sharedobjs" = "yes"; then
     APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , yes)
 else
     APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , no)
+    if test "$sharedobjs" = "yes"; then
+        LIBS="$LIBS -ldl"
+        LTFLAGS="$LTFLAGS -export-dynamic"
+        ac_cv_enable_dso="yes"
+    fi
 fi
 AC_CACHE_SAVE
+
+APACHE_MODPATH_FINISH
     
 APACHE_SUBST(STANDARD_LIBS)